Commit 36d46dff authored by Oleksandr Suvorov's avatar Oleksandr Suvorov Committed by Shawn Guo
Browse files

ARM: dts: imx6q-apalis: Move parallel rgb interface to SoM dtsi 



Move all Parallel RGB-related nodes to the module level and disable it by
default. This allows to enable it in an overlay per the current system
configuration.

Update SPDX-License spelling to latest convention.
Update Copyright year.

Signed-off-by: default avatarOleksandr Suvorov <oleksandr.suvorov@toradex.com>
Signed-off-by: default avatarMax Krummenacher <max.krummenacher@toradex.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 4eb56e26

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

+2 −55
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+ OR MIT

// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright 2014-2020 Toradex

 * Copyright 2014-2022 Toradex

 * Copyright 2012 Freescale Semiconductor, Inc.

 * Copyright 2011 Linaro Ltd.

 */
@@ -44,48 +44,6 @@ wakeup { 
		};

	};



	lcd_display: disp0 {

		compatible = "fsl,imx-parallel-display";

		#address-cells = <1>;

		#size-cells = <0>;

		interface-pix-fmt = "rgb24";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_ipu1_lcdif>;

		status = "okay";



		port@0 {

			reg = <0>;



			lcd_display_in: endpoint {

				remote-endpoint = <&ipu1_di1_disp1>;

			};

		};



		port@1 {

			reg = <1>;



			lcd_display_out: endpoint {

				remote-endpoint = <&lcd_panel_in>;

			};

		};

	};



	panel: panel {

		/*

		 * edt,et057090dhu: EDT 5.7" LCD TFT

		 * edt,et070080dh6: EDT 7.0" LCD TFT

		 */

		compatible = "edt,et057090dhu";

		backlight = <&backlight>;

		power-supply = <&reg_3v3_sw>;



		port {

			lcd_panel_in: endpoint {

				remote-endpoint = <&lcd_display_out>;

			};

		};

	};



	reg_pcie_switch: regulator-pcie-switch {

		compatible = "regulator-fixed";

		regulator-name = "pcie_switch";
@@ -106,13 +64,6 @@ reg_3v3_sw: regulator-3v3-sw { 
	};

};



&backlight {

	brightness-levels = <0 127 191 223 239 247 251 255>;

	default-brightness-level = <1>;

	power-supply = <&reg_3v3_sw>;

	status = "okay";

};



&can1 {

	xceiver-supply = <&reg_3v3_sw>;

	status = "okay";
@@ -164,10 +115,6 @@ &i2c3 { 
	status = "okay";

};



&ipu1_di1_disp1 {

	remote-endpoint = <&lcd_display_in>;

};



&ldb {

	status = "okay";

};

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

+2 −53
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+ OR MIT

// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright 2014-2020 Toradex

 * Copyright 2014-2022 Toradex

 * Copyright 2012 Freescale Semiconductor, Inc.

 * Copyright 2011 Linaro Ltd.

 */
@@ -45,47 +45,6 @@ wakeup { 
		};

	};



	lcd_display: disp0 {

		compatible = "fsl,imx-parallel-display";

		#address-cells = <1>;

		#size-cells = <0>;

		interface-pix-fmt = "rgb24";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_ipu1_lcdif>;

		status = "okay";



		port@0 {

			reg = <0>;



			lcd_display_in: endpoint {

				remote-endpoint = <&ipu1_di1_disp1>;

			};

		};



		port@1 {

			reg = <1>;



			lcd_display_out: endpoint {

				remote-endpoint = <&lcd_panel_in>;

			};

		};

	};



	panel: panel {

		/*

		 * edt,et057090dhu: EDT 5.7" LCD TFT

		 * edt,et070080dh6: EDT 7.0" LCD TFT

		 */

		compatible = "edt,et057090dhu";

		backlight = <&backlight>;



		port {

			lcd_panel_in: endpoint {

				remote-endpoint = <&lcd_display_out>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";
@@ -114,12 +73,6 @@ led5-red { 
	};

};



&backlight {

	brightness-levels = <0 127 191 223 239 247 251 255>;

	default-brightness-level = <1>;

	status = "okay";

};



&can1 {

	status = "okay";

};
@@ -164,10 +117,6 @@ &i2c3 { 
	status = "okay";

};



&ipu1_di1_disp1 {

	remote-endpoint = <&lcd_display_in>;

};



&ldb {

	status = "okay";

};

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

+2 −53
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+ OR MIT

// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright 2014-2020 Toradex

 * Copyright 2014-2022 Toradex

 * Copyright 2012 Freescale Semiconductor, Inc.

 * Copyright 2011 Linaro Ltd.

 */
@@ -44,47 +44,6 @@ wakeup { 
		};

	};



	lcd_display: disp0 {

		compatible = "fsl,imx-parallel-display";

		#address-cells = <1>;

		#size-cells = <0>;

		interface-pix-fmt = "rgb24";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_ipu1_lcdif>;

		status = "okay";



		port@0 {

			reg = <0>;



			lcd_display_in: endpoint {

				remote-endpoint = <&ipu1_di1_disp1>;

			};

		};



		port@1 {

			reg = <1>;



			lcd_display_out: endpoint {

				remote-endpoint = <&lcd_panel_in>;

			};

		};

	};



	panel: panel {

		/*

		 * edt,et057090dhu: EDT 5.7" LCD TFT

		 * edt,et070080dh6: EDT 7.0" LCD TFT

		 */

		compatible = "edt,et057090dhu";

		backlight = <&backlight>;



		port {

			lcd_panel_in: endpoint {

				remote-endpoint = <&lcd_display_out>;

			};

		};

	};



	leds {

		compatible = "gpio-leds";
@@ -113,12 +72,6 @@ led5-red { 
	};

};



&backlight {

	brightness-levels = <0 127 191 223 239 247 251 255>;

	default-brightness-level = <1>;

	status = "okay";

};



&can1 {

	status = "okay";

};
@@ -168,10 +121,6 @@ &i2c3 { 
	status = "okay";

};



&ipu1_di1_disp1 {

	remote-endpoint = <&lcd_display_in>;

};



&ldb {

	status = "okay";

};

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

+49 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0+ OR MIT

// SPDX-License-Identifier: GPL-2.0-or-later OR MIT

/*

 * Copyright 2014-2020 Toradex

 * Copyright 2014-2022 Toradex

 * Copyright 2012 Freescale Semiconductor, Inc.

 * Copyright 2011 Linaro Ltd.

 */
@@ -21,11 +21,53 @@ backlight: backlight { 
		compatible = "pwm-backlight";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_gpio_bl_on>;

		pwms = <&pwm4 0 5000000>;

		brightness-levels = <0 127 191 223 239 247 251 255>;

		default-brightness-level = <1>;

		enable-gpios = <&gpio3 13 GPIO_ACTIVE_HIGH>;

		power-supply = <&reg_module_3v3>;

		pwms = <&pwm4 0 5000000>;

		status = "disabled";

	};



	lcd_display: disp0 {

		compatible = "fsl,imx-parallel-display";

		#address-cells = <1>;

		#size-cells = <0>;

		interface-pix-fmt = "rgb24";

		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_ipu1_lcdif>;

		status = "disabled";



		port@0 {

			reg = <0>;



			lcd_display_in: endpoint {

				remote-endpoint = <&ipu1_di1_disp1>;

			};

		};



		port@1 {

			reg = <1>;



			lcd_display_out: endpoint {

				remote-endpoint = <&lcd_panel_in>;

			};

		};

	};



	panel_dpi: panel-dpi {

		compatible = "edt,et057090dhu";

		backlight = <&backlight>;



		status = "disabled";



		port {

			lcd_panel_in: endpoint {

				remote-endpoint = <&lcd_display_out>;

			};

		};

	};



	reg_module_3v3: regulator-module-3v3 {

		compatible = "regulator-fixed";

		regulator-name = "+V3.3";
@@ -553,6 +595,10 @@ &i2c3 { 
	status = "disabled";

};



&ipu1_di1_disp1 {

	remote-endpoint = <&lcd_display_in>;

};



&pwm1 {

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pwm1>;