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

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

[Stephen Rothwell]

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

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/sh_mmcif.c between commits 916001fe33b7 ("mmc: sh_mmcif:
remove unneeded struct sh_mmcif_dma, prepare to shdma conversion") and
0e79f9ae1610 ("mmc: sh_mmcif: switch to the new DMA channel allocation
and configuration") from the slave-dma tree and commit bf68a812f06c
("mmc: sh-mmcif: add OF support, make platform data optional") from the
mmc tree.

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

diff --cc drivers/mmc/host/sh_mmcif.c
index 0f07d28,b2af713..0000000
--- a/drivers/mmc/host/sh_mmcif.c
+++ b/drivers/mmc/host/sh_mmcif.c
@@@ -372,14 -376,17 +374,14 @@@ static void sh_mmcif_start_dma_tx(struc
  static void sh_mmcif_request_dma(struct sh_mmcif_host *host,
  				 struct sh_mmcif_plat_data *pdata)
  {
 -	struct sh_dmae_slave *tx, *rx;
 +	struct resource *res = platform_get_resource(host->pd, IORESOURCE_MEM, 0);
 +	struct dma_slave_config cfg;
 +	dma_cap_mask_t mask;
 +	int ret;
 +
  	host->dma_active = false;
  
- 	if (pdata->slave_id_tx <= 0 || pdata->slave_id_rx <= 0)
 -	if (!pdata)
++	if (!pdata || pdata->slave_id_tx <= 0 || pdata->slave_id_rx <= 0)
  		return;
  
  	/* We can only either use DMA for both Tx and Rx or not use it at all */

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

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

[Vinod Koul]

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

On Fri, May 23, 2014 at 03:23:10PM +1000, Stephen Rothwell wrote:
> Hi Chris,
> 
> Today's linux-next merge of the mmc tree got a conflict in
> include/linux/omap-dma.h between commit a8246fedacad ("dmaengine: omap:
> hide filter_fn for built-in drivers") from the slave-dma tree and
> commit ee526d515ad1 ("mmc: omap_hsmmc: split omap-dma header file")
> from the mmc tree.
> 
> I fixed it up (I effectively applied the former commit to the new file)
> and can carry the fix as necessary (no action is required).
Looks fine to me

Thanks
-- 
~Vinod

> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Fri, 23 May 2014 15:19:48 +1000
> Subject: [PATCH] dmaengine: omap: fix for code movement
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  include/linux/omap-dmaengine.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/include/linux/omap-dmaengine.h b/include/linux/omap-dmaengine.h
> index 2b0b6aa01922..8e6906c72e90 100644
> --- a/include/linux/omap-dmaengine.h
> +++ b/include/linux/omap-dmaengine.h
> @@ -10,7 +10,7 @@
>  
>  struct dma_chan;
>  
> -#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE)
> +#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
>  bool omap_dma_filter_fn(struct dma_chan *, void *);
>  #else
>  static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)
> -- 
> 2.0.0.rc4
> 
> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au



-- 

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

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

[Stephen Rothwell]

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

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
include/linux/omap-dma.h between commit a8246fedacad ("dmaengine: omap:
hide filter_fn for built-in drivers") from the slave-dma tree and
commit ee526d515ad1 ("mmc: omap_hsmmc: split omap-dma header file")
from the mmc tree.

I fixed it up (I effectively applied the former commit to the new file)
and can carry the fix as necessary (no action is required).

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 23 May 2014 15:19:48 +1000
Subject: [PATCH] dmaengine: omap: fix for code movement

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 include/linux/omap-dmaengine.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/linux/omap-dmaengine.h b/include/linux/omap-dmaengine.h
index 2b0b6aa01922..8e6906c72e90 100644
--- a/include/linux/omap-dmaengine.h
+++ b/include/linux/omap-dmaengine.h
@@ -10,7 +10,7 @@
 
 struct dma_chan;
 
-#if defined(CONFIG_DMA_OMAP) || defined(CONFIG_DMA_OMAP_MODULE)
+#if defined(CONFIG_DMA_OMAP) || (defined(CONFIG_DMA_OMAP_MODULE) && defined(MODULE))
 bool omap_dma_filter_fn(struct dma_chan *, void *);
 #else
 static inline bool omap_dma_filter_fn(struct dma_chan *c, void *d)
-- 
2.0.0.rc4

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

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

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

[Stephen Rothwell]

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

Hi Chris,

Today's linux-next merge of the mmc tree got a conflict in
drivers/mmc/host/atmel-mci.c between commit e2b35f3dbfc0
("dmaengine/dw_dmac: Fix dw_dmac user drivers to adapt to slave_config
changes") from the slave-dma tree and commit 43df92914ea0 ("mmc:
atmel-mci: don't use dma features when dma is present but there is no
chan available") from the mmc 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/mmc/host/atmel-mci.c
index 44062d3,390863e..0000000
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@@ -1970,19 -1971,13 +1970,21 @@@ static bool atmci_configure_dma(struct 
  			dma_request_channel(mask, atmci_filter, pdata->dma_slave);
  	}
  	if (!host->dma.chan) {
- 		dev_notice(&host->pdev->dev, "DMA not available, using PIO\n");
+ 		dev_warn(&host->pdev->dev, "no DMA channel available\n");
+ 		return false;
  	} else {
  		dev_info(&host->pdev->dev,
- 					"Using %s for DMA transfers\n",
+ 					"using %s for DMA transfers\n",
  					dma_chan_name(host->dma.chan));
 +
 +		host->dma_conf.src_addr = host->mapbase + ATMCI_RDR;
 +		host->dma_conf.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 +		host->dma_conf.src_maxburst = 1;
 +		host->dma_conf.dst_addr = host->mapbase + ATMCI_TDR;
 +		host->dma_conf.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;
 +		host->dma_conf.dst_maxburst = 1;
 +		host->dma_conf.device_fc = false;
+ 		return true;
  	}
  }
  

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