arm: dts: odroid: make the gpio key node for power key common

The gpio key for power enable is common in both of Odroid X2 and U3. So move the
dt node to the common odroid dt file from the odroid x2 dt file.

Change-Id: Id295289e092bcd71f9854de6896cb7d5cfae9540
Signed-off-by: Hyungwon Hwang <human.hwang@samsung.com>

diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index 90ad77f..6acf07a 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -521,6 +521,22 @@
                compatible = "hardkernel,odroid-reboot";
                reset-gpio = <&gpk1 2 0>;
        };
+
+       gpio_keys {
+               compatible = "gpio-keys";
+               pinctrl-names = "default";
+               pinctrl-0 = <&gpio_power_key>;
+
+               power_key {
+                       interrupt-parent = <&gpx1>;
+                       interrupts = <3 0>;
+                       gpios = <&gpx1 3 1>;
+                       linux,code = <116>;
+                       label = "power key";
+                       debounce-interval = <10>;
+                       gpio-key,wakeup;
+               };
+       };
 };
 
 &pinctrl_1 {

diff --git a/arch/arm/boot/dts/exynos4412-odroidx2.dts b/arch/arm/boot/dts/exynos4412-odroidx2.dts
index 6d3ce8c..3474b49 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-odroidx2.dts
+++ b/arch/arm/boot/dts/exynos4412-odroidx2.dts
@@ -39,20 +39,8 @@
        };
 
        gpio_keys {
-               compatible = "gpio-keys";
-               pinctrl-names = "default";
                pinctrl-0 = <&gpio_power_key &gpio_home_key>;
 
-               power_key {
-                       interrupt-parent = <&gpx1>;
-                       interrupts = <3 0>;
-                       gpios = <&gpx1 3 1>;
-                       linux,code = <116>;
-                       label = "power key";
-                       debounce-interval = <10>;
-                       gpio-key,wakeup;
-               };
-
                home_key {
                        interrupt-parent = <&gpx2>;
                        interrupts = <2 0>;