Commit a5fa132b authored by Marcel Ziswiler's avatar Marcel Ziswiler Committed by Shawn Guo
Browse files

ARM: dts: imx6ull-colibri: move gpio-keys node to som dtsi 



The gpio-keys define module level wake-up pin functionality. Move it
from the carrier board dts file to the Som dtsi file.
While at it, also re-order the properties in the gpio-keys node
alphabetically and rename to sub-node from power to wakeup.

Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 17c101d8

arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi

+0 −15
Original line number Original line Diff line number Diff line
@@ -8,20 +8,6 @@ 
		stdout-path = "serial0:115200n8";

		stdout-path = "serial0:115200n8";

	};

	};





	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_snvs_gpiokeys>;



		power {

			label = "Wake-Up";

			gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>;

			linux,code = <KEY_WAKEUP>;

			debounce-interval = <10>;

			wakeup-source;

		};

	};



	/* fixed crystal dedicated to mcp2515 */

	/* fixed crystal dedicated to mcp2515 */

	clk16m: clk16m {

	clk16m: clk16m {

		compatible = "fixed-clock";

		compatible = "fixed-clock";
@@ -29,7 +15,6 @@ 
		clock-frequency = <16000000>;

		clock-frequency = <16000000>;

	};

	};







	reg_3v3: regulator-3v3 {

	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		compatible = "regulator-fixed";

		regulator-name = "3.3V";

		regulator-name = "3.3V";

arch/arm/boot/dts/imx6ull-colibri.dtsi

+15 −1
Original line number Original line Diff line number Diff line
@@ -24,6 +24,20 @@ 
		status = "okay";

		status = "okay";

	};

	};





	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_snvs_gpiokeys>;



		wakeup {

			debounce-interval = <10>;

			gpios = <&gpio5 1 GPIO_ACTIVE_HIGH>; /* SODIMM 45 */

			label = "Wake-Up";

			linux,code = <KEY_WAKEUP>;

			wakeup-source;

		};

	};



	panel_dpi: panel-dpi {

	panel_dpi: panel-dpi {

		compatible = "edt,et057090dhu";

		compatible = "edt,et057090dhu";

		backlight = <&backlight>;

		backlight = <&backlight>;
@@ -707,7 +721,7 @@ 




	pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp {

	pinctrl_snvs_gpiokeys: snvs-gpiokeys-grp {

		fsl,pins = <

		fsl,pins = <

			MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01	0x130a0	/* SODIMM 45 */

			MX6ULL_PAD_SNVS_TAMPER1__GPIO5_IO01	0x130a0	/* SODIMM 45 / WAKE_UP */

		>;

		>;

	};

	};