diff options
| author |  Max Krummenacher <max.krummenacher@toradex.com>
| 2022-06-15 13:49:56 +0200 |
|---|---|---|
| committer |  Shawn Guo <shawnguo@kernel.org>
| 2022-06-20 09:12:21 +0800 |
| commit | 1347e20118d58926672e969e608485e9876427db (patch) | |
| tree | 29ab392218801360da7e7c72325e3c1a87904ea7 | |
| parent | ARM: dts: imx6q-apalis: Move Atmel MXT touch ctrl to SoM dtsi (diff) | |
| download | linux-1347e20118d58926672e969e608485e9876427db.tar.gz linux-1347e20118d58926672e969e608485e9876427db.tar.bz2 linux-1347e20118d58926672e969e608485e9876427db.zip | |
ARM: dts: imx6q-apalis: move gpio-keys to SoM dtsi
Move gpio-keys to module-level device tree given it is standard Apalis
functionality.
Sort properties alphabetical.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
| -rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-eval.dts | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-apalis-ixora.dts | 14 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 14 |
3 files changed, 14 insertions, 28 deletions
diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 5985d1169be1..fdcb740a7a54 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -30,20 +30,6 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_keys>; - - wakeup { - label = "Wake-Up"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - linux,code = <KEY_WAKEUP>; - debounce-interval = <10>; - wakeup-source; - }; - }; - reg_pcie_switch: regulator-pcie-switch { compatible = "regulator-fixed"; regulator-name = "pcie_switch"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 6743617ad1c1..e6fc76776b2e 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -30,20 +30,6 @@ stdout-path = "serial0:115200n8"; }; - gpio-keys { - compatible = "gpio-keys"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_gpio_keys>; - - wakeup { - label = "Wake-Up"; - gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; - linux,code = <KEY_WAKEUP>; - debounce-interval = <10>; - wakeup-source; - }; - }; - leds { compatible = "gpio-leds"; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 3aa66b6d0c88..240783d0901c 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -29,6 +29,20 @@ status = "disabled"; }; + gpio-keys { + compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; + + wakeup { + debounce-interval = <10>; + gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; + label = "Wake-Up"; + linux,code = <KEY_WAKEUP>; + wakeup-source; + }; + }; + lcd_display: disp0 { compatible = "fsl,imx-parallel-display"; #address-cells = <1>; |