linux-next: manual merge of the arm-soc tree with the slave-dma tree

linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/mmc/host/davinci_mmc.c between commit b5daabbd3d18 ("mmc:
davinci_mmc: convert to DMA engine API") from the slave-dma tree and
commit ec2a0833e515 ("ARM: davinci: move platform_data definitions") 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@canb.auug.org.au

diff --cc drivers/mmc/host/davinci_mmc.c
index c5e1eeb,3dfd347..0000000
--- a/drivers/mmc/host/davinci_mmc.c
+++ b/drivers/mmc/host/davinci_mmc.c
@@@ -30,12 -30,11 +30,12 @@@
  #include <linux/io.h>
  #include <linux/irq.h>
  #include <linux/delay.h>
 +#include <linux/dmaengine.h>
  #include <linux/dma-mapping.h>
 +#include <linux/edma.h>
  #include <linux/mmc/mmc.h>
  
- #include <mach/mmc.h>
+ #include <linux/platform_data/mmc-davinci.h>
 -#include <mach/edma.h>
  
  /*
   * Register Definitions

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got conflicts in
arch/arm/mach-spear3xx/spear3xx.c and arch/arm/mach-spear6xx/spear6xx.c
between commit 3a95b9fbba89 ("pl080.h: moved from
arm/include/asm/hardware to include/linux/amba/") from the slave-dma tree
and commit e9c515589df7 ("ARM: spear: use common irqchip_init function")
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@canb.auug.org.au

diff --cc arch/arm/mach-spear3xx/spear3xx.c
index 3d9b1b5,b2ba516..0000000
--- a/arch/arm/mach-spear3xx/spear3xx.c
+++ b/arch/arm/mach-spear3xx/spear3xx.c
@@@ -15,10 -15,8 +15,7 @@@
  
  #include <linux/amba/pl022.h>
  #include <linux/amba/pl08x.h>
- #include <linux/irqchip/spear-shirq.h>
- #include <linux/of_irq.h>
  #include <linux/io.h>
- #include <asm/hardware/vic.h>
 -#include <asm/hardware/pl080.h>
  #include <plat/pl080.h>
  #include <mach/generic.h>
  #include <mach/spear.h>
diff --cc arch/arm/mach-spear6xx/spear6xx.c
index 8ce65a2,b8bd33c..0000000
--- a/arch/arm/mach-spear6xx/spear6xx.c
+++ b/arch/arm/mach-spear6xx/spear6xx.c
@@@ -16,12 -16,11 +16,11 @@@
  #include <linux/amba/pl08x.h>
  #include <linux/clk.h>
  #include <linux/err.h>
+ #include <linux/irqchip.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
- #include <linux/of_irq.h>
  #include <linux/of_platform.h>
 -#include <asm/hardware/pl080.h>
 +#include <linux/amba/pl080.h>
- #include <asm/hardware/vic.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
  #include <asm/mach/map.h>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-spear13xx/spear1340.c between commit f9965aa20706 ("ARM:
SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree
and commit 0529e315bbda ("ARM: use common irqchip_init for GIC init")
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@canb.auug.org.au

diff --cc arch/arm/mach-spear13xx/spear1340.c
index 69c8f72,9a28beb..0000000
--- a/arch/arm/mach-spear13xx/spear1340.c
+++ b/arch/arm/mach-spear13xx/spear1340.c
@@@ -18,9 -18,9 +18,9 @@@
  #include <linux/delay.h>
  #include <linux/dw_dmac.h>
  #include <linux/of_platform.h>
 +#include <linux/pata_arasan_cf_data.h>
- #include <asm/hardware/gic.h>
+ #include <linux/irqchip.h>
  #include <asm/mach/arch.h>
 -#include <mach/dma.h>
  #include <mach/generic.h>
  #include <mach/spear.h>
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

Hi,

On Tue, 27 Nov 2012 11:08:36 +0530 Viresh Kumar <viresh.kumar@linaro.org> wrote:
>
> On 27 November 2012 10:14, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > Today's linux-next merge of the arm-soc tree got a conflict in
> > arch/arm/mach-spear13xx/spear1310.c between commit b47394911c26 ("ARM:
> > SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree
> > and commit 300a6856324a ("ARM: SPEAr1310: Fix AUXDATA for compact flash
> > controller") from the arm-soc tree.
> >
> > I have no idea how to fix this up, so I just effectively dropped the
> > arm-doc tree patch.
> 
> So sorry for that, Can you please take arm-soc version here? Patch 300a6856324a
> is doing the correct thing. i.e. we need
> 
> +       OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_pdata),
> 
> instead of
> 
> +       OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, "cf"),

Done, it should be correct on today's linux-next.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Viresh Kumar]

On 27 November 2012 10:14, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in
> arch/arm/mach-spear13xx/spear1310.c between commit b47394911c26 ("ARM:
> SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree
> and commit 300a6856324a ("ARM: SPEAr1310: Fix AUXDATA for compact flash
> controller") from the arm-soc tree.
>
> I have no idea how to fix this up, so I just effectively dropped the
> arm-doc tree patch.

Hi Stephen,

So sorry for that, Can you please take arm-soc version here? Patch 300a6856324a
is doing the correct thing. i.e. we need

+       OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, &cf_pdata),

instead of

+       OF_DEV_AUXDATA("arasan,cf-spear1340", MCIF_CF_BASE, NULL, "cf"),

--
viresh

linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
arch/arm/mach-spear13xx/spear1310.c between commit b47394911c26 ("ARM:
SPEAr13xx: Pass DW DMAC platform data from DT") from the slave-dma tree
and commit 300a6856324a ("ARM: SPEAr1310: Fix AUXDATA for compact flash
controller") from the arm-soc tree.

I have no idea how to fix this up, so I just effectively dropped the
arm-doc tree patch.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

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@canb.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@ea800000 {
 +			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@b2400000 {
+ 			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@b2000000 {
+ 			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@e0700000 {
  			compatible = "st,spear1340-pinmux";
  			reg = <0xe0700000 0x1000>;

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/spi/spi-davinci.c between commit 048177ce3b39 ("spi: spi-davinci:
convert to DMA engine API") from the slave-dma tree and commit
ec2a0833e515 ("ARM: davinci: move platform_data definitions") 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@canb.auug.org.au

diff --cc drivers/spi/spi-davinci.c
index c1ec52d,3afe2f4..0000000
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@@ -32,7 -30,8 +32,7 @@@
  #include <linux/spi/spi_bitbang.h>
  #include <linux/slab.h>
  
- #include <mach/spi.h>
+ #include <linux/platform_data/spi-davinci.h>
 -#include <mach/edma.h>
  
  #define SPI_NO_RESOURCE		((resource_size_t)-1)
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/mmp_tdma.c between commit f1a7757008b8 ("dmaengine: mmp_tdma:
add dt support") from the slave-dma tree and commit 293b2da1b611 ("ARM:
pxa: move platform_data definitions") 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@canb.auug.org.au

diff --cc drivers/dma/mmp_tdma.c
index b93d73c,07fa486..0000000
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@@ -19,8 -19,7 +19,8 @@@
  #include <linux/platform_device.h>
  #include <linux/device.h>
  #include <mach/regs-icu.h>
- #include <mach/sram.h>
 +#include <linux/of_device.h>
+ #include <linux/platform_data/dma-mmp_tdma.h>
  
  #include "dmaengine.h"
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the arm-soc tree with the slave-dma tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the arm-soc tree got a conflict in
drivers/dma/imx-sdma.c between commit 2ccaef0520d1 ("dma: imx-sdma: make
channel0 operations atomic") from the slave-dma tree and commit
7560e3f3581e ("dmaengine i.MX SDMA: do not depend on grouped clocks")
from the arm-soc tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/dma/imx-sdma.c
index a472a29,fddccae..0000000
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
@@@ -323,8 -322,9 +323,9 @@@ struct sdma_engine 
  	struct sdma_context_data	*context;
  	dma_addr_t			context_phys;
  	struct dma_device		dma_device;
- 	struct clk			*clk;
+ 	struct clk			*clk_ipg;
+ 	struct clk			*clk_ahb;
 -	struct mutex			channel_0_lock;
 +	spinlock_t			channel_0_lock;
  	struct sdma_script_start_addrs	*script_addrs;
  };
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]