Subject: linux-next: manual merge of the staging tree with the tree

From: Mark Brown <[email-masked]>
Date: Wed, 12 Mar 2014 01:27:01 +0000

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in arch/arm/boot/dts/imx53-qsb.dts between various commits from the arm-soc tree and commit 17b5001b5143e3b ("imx-drm: convert to componentised device support") from the staging tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

diff --cc arch/arm/boot/dts/imx53-qsb.dts
index dec4b073ceb1,8b254289344f..000000000000
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 2dca98b79f48..50823d0f05bf 100644
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -17,7 +17,7 @@
                reg = <0x70000000 0x40000000>;
        };
 
-       display@di0 {
+       display0: display@di0 {
                compatible = "fsl,imx-parallel-display";
                crtcs = <&ipu 0>;
                interface-pix-fmt = "rgb565";
@@ -68,6 +68,12 @@
                };
        };
 
+       imx-drm {
+               compatible = "fsl,imx-drm";
+               crtcs = <&ipu 0>;
+               connectors = <&display0>;
+       };
+
        leds {
                compatible = "gpio-leds";
                pinctrl-names = "default";