sh: sh7757lcr: update to the new MMCIF DMA configuration
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Wed, 18 Jan 2012 09:24:17 +0000 (10:24 +0100)
committerPaul Mundt <lethal@linux-sh.org>
Wed, 18 Jan 2012 11:51:26 +0000 (21:51 +1000)
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>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/boards/board-sh7757lcr.c

index 33dc5b6..8d2ae10 100644 (file)
@@ -210,21 +210,13 @@ 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 |
                          MMC_CAP_NONREMOVABLE,
        .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 = {