diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-04-18 05:43:18 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-07-31 07:06:23 -0400 |
commit | 8a23fa1b95b2e3878c16dcc4e18976bc46dd970b (patch) | |
tree | d784f31a7633726edb93a79865995419aecb2456 /arch/arm/mach-omap2 | |
parent | 4e078fbd581a92fa26ba2def4ac8f2a633cdcb5b (diff) |
ARM: omap: remove mmc platform data dma_mask and initialization
DMAengine uses the DMA engine device structure when mapping/unmapping
memory for DMA, so the MMC devices do not need their DMA masks
initialized (this reflects hardware: the MMC device is not the device
doing DMA.)
Tested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c index 2c5d0ed75285..677357ff61ac 100644 --- a/arch/arm/mach-omap2/board-n8x0.c +++ b/arch/arm/mach-omap2/board-n8x0.c | |||
@@ -468,7 +468,6 @@ static struct omap_mmc_platform_data mmc1_data = { | |||
468 | .cleanup = n8x0_mmc_cleanup, | 468 | .cleanup = n8x0_mmc_cleanup, |
469 | .shutdown = n8x0_mmc_shutdown, | 469 | .shutdown = n8x0_mmc_shutdown, |
470 | .max_freq = 24000000, | 470 | .max_freq = 24000000, |
471 | .dma_mask = 0xffffffff, | ||
472 | .slots[0] = { | 471 | .slots[0] = { |
473 | .wires = 4, | 472 | .wires = 4, |
474 | .set_power = n8x0_mmc_set_power, | 473 | .set_power = n8x0_mmc_set_power, |
diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index be697d4e0843..a9675d8d1822 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c | |||
@@ -315,7 +315,6 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, | |||
315 | mmc->slots[0].caps = c->caps; | 315 | mmc->slots[0].caps = c->caps; |
316 | mmc->slots[0].pm_caps = c->pm_caps; | 316 | mmc->slots[0].pm_caps = c->pm_caps; |
317 | mmc->slots[0].internal_clock = !c->ext_clock; | 317 | mmc->slots[0].internal_clock = !c->ext_clock; |
318 | mmc->dma_mask = 0xffffffff; | ||
319 | mmc->max_freq = c->max_freq; | 318 | mmc->max_freq = c->max_freq; |
320 | if (cpu_is_omap44xx()) | 319 | if (cpu_is_omap44xx()) |
321 | mmc->reg_offset = OMAP4_MMC_REG_OFFSET; | 320 | mmc->reg_offset = OMAP4_MMC_REG_OFFSET; |