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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-Id: <20121126200243.7ad73ab21990661a3f12a01c@canb.auug.org.au>
Date:	Mon, 26 Nov 2012 20:02:43 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Linus Walleij <linus.walleij@...aro.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Bo Shen <voice.shen@...el.com>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Liam Girdwood <lrg@...com>,
	Ludovic Desroches <ludovic.desroches@...el.com>
Subject: linux-next: manual merge of the pinctrl tree with the sound-asoc
 tree

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@...b.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@...a8000 {
+ 				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@...bc000 {
 +				status = "okay";
 +				pinctrl-0 = <&pinctrl_ssc0_tx>;
 +			};
++
+ 			pinctrl@...ff400 {
+ 				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@...00000 {

Content of type "application/pgp-signature" skipped