linux-next: manual merge of the pinctrl tree with the sound-asoctree

[Stephen Rothwell]

Hi Linus,

Today's linux-next merge of the pinctrl tree got a conflict in
arch/arm/boot/dts/at91sam9260.dtsi between commit 099343c64e16 ("ARM:
at91: atmel-ssc: add device tree support") from the sound-asoc tree and
commit 9873137a7a22 ("ARM: at91/dts: add nodes for atmel hsmci
controllers for atmel SOCs") from the pinctrl 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/at91sam9260.dtsi
index aaa42d8,b1d3fab..0000000
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@@ -213,13 -436,15 +437,22 @@@
  				status = "disabled";
  			};
  
+ 			mmc0: mmc@fffa8000 {
+ 				compatible = "atmel,hsmci";
+ 				reg = <0xfffa8000 0x600>;
+ 				interrupts = <9 4 0>;
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+ 				status = "disabled";
+ 			};
+ 
 +			ssc0: ssc@fffbc000 {
 +				compatible = "atmel,at91rm9200-ssc";
 +				reg = <0xfffbc000 0x4000>;
 +				interrupts = <14 4 5>;
 +				status = "disable";
 +			};
 +
  			adc0: adc@fffe0000 {
  				compatible = "atmel,at91sam9260-adc";
  				reg = <0xfffe0000 0x100>;

Attachment: pgp00000.pgp
Description: PGP signature