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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1457 bytes --]

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@canb.auug.org.au

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 #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1240 bytes --]

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@canb.auug.org.au

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 #2: Type: application/pgp-signature, Size: 836 bytes --]