Commit 1347e201 authored by Max Krummenacher's avatar Max Krummenacher Committed by Shawn Guo
Browse files

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: default avatarMax Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 2c119c4d

arch/arm/boot/dts/imx6q-apalis-eval.dts

+0 −14
Original line number Diff line number Diff line
@@ -30,20 +30,6 @@ chosen { 
		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";

arch/arm/boot/dts/imx6q-apalis-ixora.dts

+0 −14
Original line number Diff line number Diff line
@@ -30,20 +30,6 @@ chosen { 
		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";

arch/arm/boot/dts/imx6qdl-apalis.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -29,6 +29,20 @@ backlight: backlight { 
		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>;