diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
index 118334be6d51..35362ff176de 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidc4_android.dts
@@ -59,36 +59,6 @@
 		compatible = "odroid-sysfs";
 		status = "okay";
 	};
-
-	gpio_keys_polled {
-		status = "disabled";
-		compatible =
-			"gpio-keys-polled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			poll-interval = <100>;
-			autorepeat;
-			button@1 {
-				label = "GPIO Key F7";
-				linux,code = <65>;
-				gpios = <&gpio GPIOX_4 1>;
-			};
-			button@2 {
-				label = "GPIO Key F8";
-				linux,code = <66>;
-				gpios = <&gpio GPIOX_7 1>;
-			};
-			button@3 {
-				label = "GPIO Key F9";
-				linux,code = <67>;
-				gpios = <&gpio GPIOX_0 1>;
-			};
-			button@4 {
-				label = "GPIO Key F10";
-				linux,code = <68>;
-				gpios = <&gpio GPIOX_1 1>;
-			};
-	};
 };
 
 &custom_maps {
diff --git a/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
index 9f8b7835f043..3c03bf6d47da 100644
--- a/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
+++ b/arch/arm64/boot/dts/amlogic/meson64_odroidn2_android.dts
@@ -59,36 +59,6 @@
 		compatible = "odroid-sysfs";
 		status = "okay";
 	};
-
-	gpio_keys_polled {
-		status = "disabled";
-		compatible =
-			"gpio-keys-polled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-			poll-interval = <100>;
-			autorepeat;
-			button@1 {
-				label = "GPIO Key F7";
-				linux,code = <65>;
-				gpios = <&gpio GPIOX_4 1>;
-			};
-			button@2 {
-				label = "GPIO Key F8";
-				linux,code = <66>;
-				gpios = <&gpio GPIOX_7 1>;
-			};
-			button@3 {
-				label = "GPIO Key F9";
-				linux,code = <67>;
-				gpios = <&gpio GPIOX_0 1>;
-			};
-			button@4 {
-				label = "GPIO Key F10";
-				linux,code = <68>;
-				gpios = <&gpio GPIOX_1 1>;
-			};
-	};
 };
 
 &custom_maps {
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
index bb685830b00f..46242f44b45a 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/Makefile
@@ -19,7 +19,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDC4) += spi0.dtbo	\
 					pwm_a-pwmfan.dtbo	\
 					pwm_b-backlight.dtbo	\
 					wifi_bt_combo.dtbo	\
-					sdio.dtbo
+					sdio.dtbo		\
+					gpio_shortcut.dtbo
 
 targets	+= $(dtbo-y)
 always	:= $(dtbo-y)
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio_shortcut.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio_shortcut.dts
new file mode 100644
index 000000000000..10521c53e120
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidc4/gpio_shortcut.dts
@@ -0,0 +1,40 @@
+/dts-v1/;
+/plugin/;
+
+/{
+	fragmetn@0 {
+		target-path ="/";
+
+		__overlay__ {
+			gpio_keys_polled {
+				status = "okay";
+				compatible =
+					"gpio-keys-polled";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				poll-interval = <100>;
+				autorepeat;
+				button@1 {
+					label = "GPIO Key F7";
+					linux,code = <65>;
+					gpios = <&gpio GPIOX_4 1>;
+				};
+				button@2 {
+					label = "GPIO Key F8";
+					linux,code = <66>;
+					gpios = <&gpio GPIOX_7 1>;
+				};
+				button@3 {
+					label = "GPIO Key F9";
+					linux,code = <67>;
+					gpios = <&gpio GPIOX_0 1>;
+				};
+				button@4 {
+					label = "GPIO Key F10";
+					linux,code = <68>;
+					gpios = <&gpio GPIOX_1 1>;
+				};
+			};
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
index 547334034668..42ccaea96794 100644
--- a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/Makefile
@@ -21,7 +21,8 @@ dtbo-$(CONFIG_ARCH_MESON64_ODROIDN2) += spi0.dtbo		\
 					pwm_c-pwmfan.dtbo		\
 					pwm_d-backlight.dtbo	\
 					gpio_spdif.dtbo	\
-					sdio.dtbo
+					sdio.dtbo		\
+					gpio_shortcut.dtbo
 
 targets	+= $(dtbo-y)
 always	:= $(dtbo-y)
diff --git a/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio_shortcut.dts b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio_shortcut.dts
new file mode 100644
index 000000000000..b4ea19820bc4
--- /dev/null
+++ b/arch/arm64/boot/dts/amlogic/overlays/odroidn2/gpio_shortcut.dts
@@ -0,0 +1,42 @@
+/dts-v1/;
+/plugin/;
+
+#include <dt-bindings/gpio/meson-g12a-gpio.h>
+#include <dt-bindings/gpio/gpio.h>
+/{
+	fragmetn@0 {
+		target-path ="/";
+
+		__overlay__ {
+			gpio_keys_polled {
+				status = "okay";
+				compatible =
+					"gpio-keys-polled";
+				#address-cells = <1>;
+				#size-cells = <0>;
+				poll-interval = <100>;
+				autorepeat;
+				button@1 {
+					label = "GPIO Key F7";
+					linux,code = <65>;
+					gpios = <&gpio GPIOX_4 1>;
+				};
+				button@2 {
+					label = "GPIO Key F8";
+					linux,code = <66>;
+					gpios = <&gpio GPIOX_7 1>;
+				};
+				button@3 {
+					label = "GPIO Key F9";
+					linux,code = <67>;
+					gpios = <&gpio GPIOX_0 1>;
+				};
+				button@4 {
+					label = "GPIO Key F10";
+					linux,code = <68>;
+					gpios = <&gpio GPIOX_1 1>;
+				};
+			};
+		};
+	};
+};