diff options
| -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 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-n8x0.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/hsmmc.c | 1 | ||||
| -rw-r--r-- | arch/arm/plat-omap/include/plat/mmc.h | 2 |
6 files changed, 0 insertions, 7 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, |
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; |
diff --git a/arch/arm/plat-omap/include/plat/mmc.h b/arch/arm/plat-omap/include/plat/mmc.h index 5493bd95da5e..eb3e4d555343 100644 --- a/arch/arm/plat-omap/include/plat/mmc.h +++ b/arch/arm/plat-omap/include/plat/mmc.h | |||
| @@ -81,8 +81,6 @@ struct omap_mmc_platform_data { | |||
| 81 | /* Return context loss count due to PM states changing */ | 81 | /* Return context loss count due to PM states changing */ |
| 82 | int (*get_context_loss_count)(struct device *dev); | 82 | int (*get_context_loss_count)(struct device *dev); |
| 83 | 83 | ||
| 84 | u64 dma_mask; | ||
| 85 | |||
| 86 | /* Integrating attributes from the omap_hwmod layer */ | 84 | /* Integrating attributes from the omap_hwmod layer */ |
| 87 | u8 controller_flags; | 85 | u8 controller_flags; |
| 88 | 86 | ||
