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

ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys 



Move aliases, chosen, extcon and gpio-keys to module-level device tree
given they are standard Colibri functionalities.

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

arch/arm/boot/dts/imx7-colibri-aster.dtsi

+0 −18
Original line number Diff line number Diff line
@@ -4,24 +4,6 @@ 
 */



/ {

	chosen {

		stdout-path = "serial0:115200n8";

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpiokeys>;



		power {

			label = "Wake-Up";

			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;

			linux,code = <KEY_WAKEUP>;

			debounce-interval = <10>;

			wakeup-source;

		};

	};



	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3.3V";

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

+0 −31
Original line number Diff line number Diff line
@@ -4,15 +4,6 @@ 
 */



/ {

	aliases {

		rtc0 = &rtc;

		rtc1 = &snvs_rtc;

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	/* fixed crystal dedicated to mpc258x */

	clk16m: clk16m {

		compatible = "fixed-clock";
@@ -20,27 +11,6 @@ clk16m: clk16m { 
		clock-frequency = <16000000>;

	};



	extcon_usbc_det: usbc-det {

		compatible = "linux,extcon-usb-gpio";

		id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbc_det>;

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpiokeys>;



		power {

			label = "Wake-Up";

			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;

			linux,code = <KEY_WAKEUP>;

			debounce-interval = <10>;

			wakeup-source;

		};

	};



	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "3.3V";
@@ -148,7 +118,6 @@ &uart3 { 
};



&usbotg1 {

	extcon = <0>, <&extcon_usbc_det>;

	status = "okay";

};

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

+32 −0
Original line number Diff line number Diff line
@@ -6,6 +6,11 @@ 
#include <dt-bindings/pwm/pwm.h>



/ {

	aliases {

		rtc0 = &rtc;

		rtc1 = &snvs_rtc;

	};



	backlight: backlight {

		brightness-levels = <0 45 63 88 119 158 203 255>;

		compatible = "pwm-backlight";
@@ -18,6 +23,32 @@ backlight: backlight { 
		status = "disabled";

	};



	chosen {

		stdout-path = "serial0:115200n8";

	};



	extcon_usbc_det: usbc-det {

		compatible = "linux,extcon-usb-gpio";

		debounce = <25>;

		id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; /* SODIMM 137 / USBC_DET */

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_usbc_det>;

	};



	gpio-keys {

		compatible = "gpio-keys";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpiokeys>;



		wakeup {

			debounce-interval = <10>;

			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 */

			label = "Wake-Up";

			linux,code = <KEY_WAKEUP>;

			wakeup-source;

		};

	};



	panel_dpi: panel-dpi {

		backlight = <&backlight>;

		compatible = "edt,et057090dhu";
@@ -513,6 +544,7 @@ &uart3 { 


&usbotg1 {

	dr_mode = "otg";

	extcon = <0>, <&extcon_usbc_det>;

};



&usdhc1 {