linux-next: manual merge of the staging tree with the imx-mxs tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in
arch/arm/boot/dts/imx51-babbage.dts between commit a198af2322a1 ("ARM:
dts: i.MX51 babbage: Support diagnostic LED") from the imx-mxs tree and
commit 17b5001b5143 ("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).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc arch/arm/boot/dts/imx51-babbage.dts
index 121dadd125c0,6ff15a0eacb3..000000000000
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@@ -81,17 -81,12 +81,23 @@@
  		};
  	};
  
 +	leds {
 +		compatible = "gpio-leds";
 +		pinctrl-names = "default";
 +		pinctrl-0 = <&pinctrl_gpio_leds>;
 +
 +		led-diagnostic {
 +			label = "diagnostic";
 +			gpios = <&gpio2 6 GPIO_ACTIVE_HIGH>;
 +		};
 +	};
 +
+ 	imx-drm {
+ 		compatible = "fsl,imx-drm";
+ 		crtcs = <&ipu 0>, <&ipu 1>;
+ 		connectors = <&display0>, <&display1>;
+ 	};
+ 
  	sound {
  		compatible = "fsl,imx51-babbage-sgtl5000",
  			     "fsl,imx-audio-sgtl5000";

Attachment: pgp7PaO52CjpC.pgp
Description: PGP signature