arm64: dts: colibri-imx8x: Move gpio-keys to som level

SODIMM_45 that is connected to "&lsio_gpio3 10" is defined in the
Colibri standard to be a wakeup pin.
Move this to the SoM level device-tree and keep it disabled by default
but do enable it again on the carrier-board.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi
index 14d479b50656a64bae99c6b1856cbafa774071f2..7264d784ae723cfa977b0953b4fed03c7d679b35 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-colibri-eval-v3.dtsi
@@ -17,20 +17,10 @@
                #clock-cells = <0>;
                clock-frequency = <16000000>;
        };
+};
 
-       gpio-keys {
-               compatible = "gpio-keys";
-               pinctrl-names = "default";
-               pinctrl-0 = <&pinctrl_gpiokeys>;
-
-               key-wakeup {
-                       label = "Wake-Up";
-                       gpios = <&lsio_gpio3 10 GPIO_ACTIVE_HIGH>;
-                       linux,code = <KEY_WAKEUP>;
-                       debounce-interval = <10>;
-                       wakeup-source;
-               };
-       };
+&colibri_gpio_keys {
+       status = "okay";
 };
 
 &i2c1 {

diff --git a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi
index 1e41965e2d01aa53bf384ed6ff93e9bf6e0e0b58..ff5ad88febc872c432d54588f622c2897084db83 100644 (file)
--- a/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi
@@ -8,6 +8,21 @@
                stdout-path = &lpuart3;
        };
 
+       colibri_gpio_keys: gpio-keys {
+               compatible = "gpio-keys";
+               pinctrl-names = "default";
+               pinctrl-0 = <&pinctrl_gpiokeys>;
+               status = "disabled";
+
+               key-wakeup {
+                       debounce-interval = <10>;
+                       gpios = <&lsio_gpio3 10 GPIO_ACTIVE_HIGH>;
+                       label = "Wake-Up";
+                       linux,code = <KEY_WAKEUP>;
+                       wakeup-source;
+               };
+       };
+
        reg_module_3v3: regulator-module-3v3 {
                compatible = "regulator-fixed";
                regulator-name = "+V3.3";