linux-kernel - linux-next: manual merge of the arm-soc tree with the slave-dma 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: <20121127153106.6e2a6c4bc100bcd4a1306740@canb.auug.org.au>
Date:	Tue, 27 Nov 2012 15:31:06 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Viresh Kumar <viresh.kumar@...aro.org>,
	Vinod Koul <vinod.koul@...el.com>,
	Shiraz Hashim <shiraz.hashim@...com>,
	Bhavna Yadav <bhavna.yadav@...com>,
	Deepak Sikri <deepak.sikri@...com>,
	Rajeev Kumar <rajeev-dlh.kumar@...com>,
	Vijay Kumar Mishra <vijay.kumar@...com>,
	Vipin Kumar <vipin.kumar@...com>,
	Vipul Kumar Samar <vipulkumar.samar@...com>
Subject: linux-next: manual merge of the arm-soc tree with the slave-dma
 tree

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/boot/dts/spear1340.dtsi between commit b47394911c26 ("ARM:
SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree
and commit 8113ba917dfa ("ARM: SPEAr: DT: Update device nodes") from the
arm-soc 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/spear1340.dtsi
index d487556,34da11a..0000000
--- a/arch/arm/boot/dts/spear1340.dtsi
+++ b/arch/arm/boot/dts/spear1340.dtsi
@@@ -24,25 -38,28 +38,47 @@@
  			status = "disabled";
  		};
  
 +		dma@...00000 {
 +			slave_info {
 +				uart1_tx {
 +					bus_id = "uart1_tx";
 +					cfg_hi = <0x6000>;	/* 0xC << 11 */
 +					cfg_lo = <0>;
 +					src_master = <0>;
 +					dst_master = <1>;
 +				};
 +				uart1_tx {
 +					bus_id = "uart1_tx";
 +					cfg_hi = <0x680>;	/* 0xD << 7 */
 +					cfg_lo = <0>;
 +					src_master = <1>;
 +					dst_master = <0>;
 +				};
 +			};
 +		};
 +
+ 		i2s-play@...00000 {
+ 			compatible = "snps,designware-i2s";
+ 			reg = <0xb2400000 0x10000>;
+ 			interrupt-names = "play_irq";
+ 			interrupts = <0 98 0x4
+ 				      0 99 0x4>;
+ 			play;
+ 			channel = <8>;
+ 			status = "disabled";
+ 		};
+ 
+ 		i2s-rec@...00000 {
+ 			compatible = "snps,designware-i2s";
+ 			reg = <0xb2000000 0x10000>;
+ 			interrupt-names = "record_irq";
+ 			interrupts = <0 100  0x4
+ 				      0 101 0x4>;
+ 			record;
+ 			channel = <8>;
+ 			status = "disabled";
+ 		};
+ 
  		pinmux: pinmux@...00000 {
  			compatible = "st,spear1340-pinmux";
  			reg = <0xe0700000 0x1000>;

Content of type "application/pgp-signature" skipped