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/at91sam9g20ek_common.dtsi between commit 531f67e41dcd
("ASoC: at91sam9g20ek-wm8731: convert to dt support") from the sound-asoc
tree and commit 4134a4552748 ("ARM: at91/dts: add nodes for atmel hsmci
controllers for atmel boards") 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/at91sam9g20ek_common.dtsi
index 2dcec8d,32a500a..0000000
--- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
+++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@@ -62,10 -59,28 +69,33 @@@
  				status = "okay";
  			};
  
+ 			mmc0: mmc@fffa8000 {
+ 				pinctrl-0 = <
+ 					&pinctrl_board_mmc0_slot1
+ 					&pinctrl_mmc0_clk
+ 					&pinctrl_mmc0_slot1_cmd_dat0
+ 					&pinctrl_mmc0_slot1_dat1_3>;
+ 				status = "okay";
+ 				slot@1 {
+ 					reg = <1>;
+ 					bus-width = <4>;
+ 					cd-gpios = <&pioC 9 0>;
+ 				};
+ 			};
+ 
 +			ssc0: ssc@fffbc000 {
 +				status = "okay";
 +				pinctrl-0 = <&pinctrl_ssc0_tx>;
 +			};
++
+ 			pinctrl@fffff400 {
+ 				mmc0_slot1 {
+ 					pinctrl_board_mmc0_slot1: mmc0_slot1-board {
+ 						atmel,pins =
+ 							<2 9 0x0 0x5>;	/* PC9 gpio CD pin pull up and deglitch */
+ 					};
+ 				};
+ 			};
  		};
  
  		nand0: nand@40000000 {

Attachment: pgp00000.pgp
Description: PGP signature