diff options
| author | Guennadi Liakhovetski <g.liakhovetski@gmx.de> | 2012-01-18 04:24:17 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-18 06:51:26 -0500 |
| commit | 482835ce02726652becc36b64522cbabc0adbeee (patch) | |
| tree | 2d4876337d2a5ab6b20ca65420ca03ab55c50930 | |
| parent | 78da107a7ed14fbc6ef77ff4c41d92b11edc9036 (diff) | |
sh: sh7757lcr: update to the new MMCIF DMA configuration
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>
| -rw-r--r-- | 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 33dc5b6e8e17..8d2ae109a83a 100644 --- a/arch/sh/boards/board-sh7757lcr.c +++ b/arch/sh/boards/board-sh7757lcr.c | |||
| @@ -210,21 +210,13 @@ static struct resource sh_mmcif_resources[] = { | |||
| 210 | }, | 210 | }, |
| 211 | }; | 211 | }; |
| 212 | 212 | ||
| 213 | static struct sh_mmcif_dma sh7757lcr_mmcif_dma = { | ||
| 214 | .chan_priv_tx = { | ||
| 215 | .slave_id = SHDMA_SLAVE_MMCIF_TX, | ||
| 216 | }, | ||
| 217 | .chan_priv_rx = { | ||
| 218 | .slave_id = SHDMA_SLAVE_MMCIF_RX, | ||
| 219 | } | ||
| 220 | }; | ||
| 221 | |||
| 222 | static struct sh_mmcif_plat_data sh_mmcif_plat = { | 213 | static struct sh_mmcif_plat_data sh_mmcif_plat = { |
| 223 | .dma = &sh7757lcr_mmcif_dma, | ||
| 224 | .sup_pclk = 0x0f, | 214 | .sup_pclk = 0x0f, |
| 225 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | | 215 | .caps = MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA | |
| 226 | MMC_CAP_NONREMOVABLE, | 216 | MMC_CAP_NONREMOVABLE, |
| 227 | .ocr = MMC_VDD_32_33 | MMC_VDD_33_34, | 217 | .ocr = MMC_VDD_32_33 | MMC_VDD_33_34, |
| 218 | .slave_id_tx = SHDMA_SLAVE_MMCIF_TX, | ||
| 219 | .slave_id_rx = SHDMA_SLAVE_MMCIF_RX, | ||
| 228 | }; | 220 | }; |
| 229 | 221 | ||
| 230 | static struct platform_device sh_mmcif_device = { | 222 | static struct platform_device sh_mmcif_device = { |
