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-omap1 | |
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-omap1')
-rw-r--r-- | arch/arm/mach-omap1/board-h2-mmc.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-h3-mmc.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c index da0e37d40823..e1362ce48497 100644 --- a/arch/arm/mach-omap1/board-h2-mmc.c +++ b/arch/arm/mach-omap1/board-h2-mmc.c | |||
@@ -54,7 +54,6 @@ static struct omap_mmc_platform_data mmc1_data = { | |||
54 | .nr_slots = 1, | 54 | .nr_slots = 1, |
55 | .init = mmc_late_init, | 55 | .init = mmc_late_init, |
56 | .cleanup = mmc_cleanup, | 56 | .cleanup = mmc_cleanup, |
57 | .dma_mask = 0xffffffff, | ||
58 | .slots[0] = { | 57 | .slots[0] = { |
59 | .set_power = mmc_set_power, | 58 | .set_power = mmc_set_power, |
60 | .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, | 59 | .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, |
diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c index f8242aa9b763..c74daace8cd6 100644 --- a/arch/arm/mach-omap1/board-h3-mmc.c +++ b/arch/arm/mach-omap1/board-h3-mmc.c | |||
@@ -36,7 +36,6 @@ static int mmc_set_power(struct device *dev, int slot, int power_on, | |||
36 | */ | 36 | */ |
37 | static struct omap_mmc_platform_data mmc1_data = { | 37 | static struct omap_mmc_platform_data mmc1_data = { |
38 | .nr_slots = 1, | 38 | .nr_slots = 1, |
39 | .dma_mask = 0xffffffff, | ||
40 | .slots[0] = { | 39 | .slots[0] = { |
41 | .set_power = mmc_set_power, | 40 | .set_power = mmc_set_power, |
42 | .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, | 41 | .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, |
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 7212ae97f44a..c54b45f32638 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
@@ -185,7 +185,6 @@ static int nokia770_mmc_get_cover_state(struct device *dev, int slot) | |||
185 | 185 | ||
186 | static struct omap_mmc_platform_data nokia770_mmc2_data = { | 186 | static struct omap_mmc_platform_data nokia770_mmc2_data = { |
187 | .nr_slots = 1, | 187 | .nr_slots = 1, |
188 | .dma_mask = 0xffffffff, | ||
189 | .max_freq = 12000000, | 188 | .max_freq = 12000000, |
190 | .slots[0] = { | 189 | .slots[0] = { |
191 | .set_power = nokia770_mmc_set_power, | 190 | .set_power = nokia770_mmc_set_power, |