Commit 233edcae authored by Denys Drozdov's avatar Denys Drozdov Committed by Shawn Guo
Browse files

ARM: dts: imx6ull-colibri: update device trees to support overlays 



Prepare in-tree device trees for out-of-tree device tree overlay support
(eMMC SKU only).

Relocate panel-dpi default to edt,et057090dhu (RGB 18bit VGA 640x480)
to the module-level dtsi and remove it from the carrier board dtsi.

Keep backlight, resistive touch and Atmel maxtouch nodes enabled
for both eMMC and NAND modules.

Signed-off-by: default avatarDenys Drozdov <denys.drozdov@toradex.com>
Signed-off-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 8d386fa0

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

+0 −29
Original line number Diff line number Diff line
@@ -29,17 +29,6 @@ 
		clock-frequency = <16000000>;

	};



	panel: panel {

		compatible = "edt,et057090dhu";

		backlight = <&bl>;

		power-supply = <&reg_3v3>;



		port {

			panel_in: endpoint {

				remote-endpoint = <&lcdif_out>;

			};

		};

	};



	reg_3v3: regulator-3v3 {

		compatible = "regulator-fixed";
@@ -71,14 +60,6 @@ 
	status = "okay";

};



&bl {

	brightness-levels = <0 4 8 16 32 64 128 255>;

	default-brightness-level = <6>;

	power-supply = <&reg_3v3>;

	pwms = <&pwm4 0 5000000 1>;

	status = "okay";

};



&ecspi1 {

	status = "okay";
@@ -107,16 +88,6 @@ 
	};

};



&lcdif {

	status = "okay";



	port {

		lcdif_out: endpoint {

			remote-endpoint = <&panel_in>;

		};

	};

};



/* PWM <A> */

&pwm4 {

	status = "okay";

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

+27 −4
Original line number Diff line number Diff line
@@ -11,12 +11,29 @@ 
		ethernet1 = &fec1;

	};



	bl: backlight {

	backlight: backlight {

		compatible = "pwm-backlight";

		brightness-levels = <0 4 8 16 32 64 128 255>;

		default-brightness-level = <6>;

		enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpio_bl_on>;

		enable-gpios = <&gpio1 11 GPIO_ACTIVE_HIGH>;

		status = "disabled";

		power-supply = <&reg_3v3>;

		pwms = <&pwm4 0 5000000 1>;

		status = "okay";

	};



	panel_dpi: panel-dpi {

		compatible = "edt,et057090dhu";

		backlight = <&backlight>;

		power-supply = <&reg_3v3>;

		status = "okay";



		port {

			lcd_panel_in: endpoint {

				remote-endpoint = <&lcdif_out>;

			};

		};

	};



	reg_module_3v3: regulator-module-3v3 {
@@ -149,7 +166,7 @@ 
	scl-gpios = <&gpio1 30 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;

	status = "okay";



	ad7879@2c {

	ad7879_ts: touchscreen@2c {

		compatible = "adi,ad7879-1";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_snvs_ad7879_int>;
@@ -170,6 +187,12 @@ 
	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_lcdif_dat

		     &pinctrl_lcdif_ctrl>;



	port {

		lcdif_out: endpoint {

			remote-endpoint = <&lcd_panel_in>;

		};

	};

};



&pwm4 {