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 for Android: free password hash cracker in your pocket

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

Message-Id: <20121126195658.064037771da7d25572848e2b@canb.auug.org.au>
Date:	Mon, 26 Nov 2012 19:56:58 +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/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@...b.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@...a8000 {
+ 				compatible = "atmel,hsmci";
+ 				reg = <0xfffa8000 0x600>;
+ 				interrupts = <9 4 0>;
+ 				#address-cells = <1>;
+ 				#size-cells = <0>;
+ 				status = "disabled";
+ 			};
+ 
 +			ssc0: ssc@...bc000 {
 +				compatible = "atmel,at91rm9200-ssc";
 +				reg = <0xfffbc000 0x4000>;
 +				interrupts = <14 4 5>;
 +				status = "disable";
 +			};
 +
  			adc0: adc@...e0000 {
  				compatible = "atmel,at91sam9260-adc";
  				reg = <0xfffe0000 0x100>;

Content of type "application/pgp-signature" skipped