Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 17b5001b authored by Russell King's avatar Russell King
Browse files

imx-drm: convert to componentised device support 



Use the componentised device support for imx-drm.  This requires all
the sub-components and the master device to register with the component
device support.

Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent f2d66aad

arch/arm/boot/dts/imx51-babbage.dts

+8 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
		reg = <0x90000000 0x20000000>;

	};



	display@di0 {

	display0: display@di0 {

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

		crtcs = <&ipu 0>;

		interface-pix-fmt = "rgb24";
@@ -43,7 +43,7 @@ 
		};

	};



	display@di1 {

	display1: display@di1 {

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

		crtcs = <&ipu 1>;

		interface-pix-fmt = "rgb565";
@@ -81,6 +81,12 @@ 
		};

	};



	imx-drm {

		compatible = "fsl,imx-drm";

		crtcs = <&ipu 0>, <&ipu 1>;

		connectors = <&display0>, <&display1>;

	};



	sound {

		compatible = "fsl,imx51-babbage-sgtl5000",

			     "fsl,imx-audio-sgtl5000";

arch/arm/boot/dts/imx53-m53evk.dts

+7 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
	};



	soc {

		display@di1 {

		display1: display@di1 {

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

			crtcs = <&ipu 1>;

			interface-pix-fmt = "bgr666";
@@ -53,6 +53,12 @@ 
		default-brightness-level = <6>;

	};



	imx-drm {

		compatible = "fsl,imx-drm";

		crtcs = <&ipu 1>;

		connectors = <&display1>;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

arch/arm/boot/dts/imx53-mba53.dts

+6 −0
Original line number Diff line number Diff line
@@ -43,6 +43,12 @@ 
		status = "disabled";

	};



	imx-drm {

		compatible = "fsl,imx-drm";

		crtcs = <&ipu 1>;

		connectors = <&disp1>, <&tve>;

	};



	reg_3p2v: 3p2v {

		compatible = "regulator-fixed";

		regulator-name = "3P2V";

arch/arm/boot/dts/imx53-qsb.dts

+7 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
		reg = <0x70000000 0x40000000>;

	};



	display@di0 {

	display0: display@di0 {

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

		crtcs = <&ipu 0>;

		interface-pix-fmt = "rgb565";
@@ -72,6 +72,12 @@ 
		};

	};



	imx-drm {

		compatible = "fsl,imx-drm";

		crtcs = <&ipu 0>;

		connectors = <&display0>;

	};



	leds {

		compatible = "gpio-leds";

		pinctrl-names = "default";

arch/arm/boot/dts/imx6q-sabresd.dts

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ 
	compatible = "fsl,imx6q-sabresd", "fsl,imx6q";

};



&imx_drm {

	crtcs = <&ipu1 0>, <&ipu1 1>, <&ipu2 0>, <&ipu2 1>;

};



&sata {

	status = "okay";

};