[PATCH] sh: sh7757lcr: update to the new MMCIF DMA configuration

[PATCH] sh: sh7757lcr: update to the new MMCIF DMA configuration

[Guennadi Liakhovetski]

Specifying MMCIF DMA slave IDs via a struct sh_mmcif_dma instance is
deprecated. Update sh7757lcr to specify slave IDs embedded in
struct sh_mmcif_plat_data.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---

Would be good to get this upstream asap, then we could remove struct 
sh_mmcif_dma for 3.4, which is also a part of the following patch series.

 arch/sh/boards/board-sh7757lcr.c |   12 ++----------
 1 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
index 895e337..d9deb15 100644
--- a/arch/sh/boards/board-sh7757lcr.c
+++ b/arch/sh/boards/board-sh7757lcr.c
@@ -209,20 +209,12 @@ static struct resource sh_mmcif_resources[] = {
 	},
 };
 
-static struct sh_mmcif_dma sh7757lcr_mmcif_dma = {
-	.chan_priv_tx	= {
-		.slave_id = SHDMA_SLAVE_MMCIF_TX,
-	},
-	.chan_priv_rx	= {
-		.slave_id = SHDMA_SLAVE_MMCIF_RX,
-	}
-};
-
 static struct sh_mmcif_plat_data sh_mmcif_plat = {
-	.dma		= &sh7757lcr_mmcif_dma,
 	.sup_pclk	= 0x0f,
 	.caps		= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA,
 	.ocr		= MMC_VDD_32_33 | MMC_VDD_33_34,
+	.slave_id_tx	= SHDMA_SLAVE_MMCIF_TX,
+	.slave_id_rx	= SHDMA_SLAVE_MMCIF_RX,
 };
 
 static struct platform_device sh_mmcif_device = {
-- 
1.7.2.5

Re: [PATCH] sh: sh7757lcr: update to the new MMCIF DMA configuration

[Paul Mundt]

On Wed, Jan 18, 2012 at 10:24:17AM +0100, Guennadi Liakhovetski wrote:
> Specifying MMCIF DMA slave IDs via a struct sh_mmcif_dma instance is
> deprecated. Update sh7757lcr to specify slave IDs embedded in
> struct sh_mmcif_plat_data.
> 
> Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
> ---
> 
> Would be good to get this upstream asap, then we could remove struct 
> sh_mmcif_dma for 3.4, which is also a part of the following patch series.
> 
I've applied it and will make sure it gets in to the next -rc along with
the identical rmobile changes, thanks.