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>
This commit is contained in:
parent
4e078fbd58
commit
8a23fa1b95
|
@ -54,7 +54,6 @@ static struct omap_mmc_platform_data mmc1_data = {
|
||||||
.nr_slots = 1,
|
.nr_slots = 1,
|
||||||
.init = mmc_late_init,
|
.init = mmc_late_init,
|
||||||
.cleanup = mmc_cleanup,
|
.cleanup = mmc_cleanup,
|
||||||
.dma_mask = 0xffffffff,
|
|
||||||
.slots[0] = {
|
.slots[0] = {
|
||||||
.set_power = mmc_set_power,
|
.set_power = mmc_set_power,
|
||||||
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
|
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
|
||||||
|
|
|
@ -36,7 +36,6 @@ static int mmc_set_power(struct device *dev, int slot, int power_on,
|
||||||
*/
|
*/
|
||||||
static struct omap_mmc_platform_data mmc1_data = {
|
static struct omap_mmc_platform_data mmc1_data = {
|
||||||
.nr_slots = 1,
|
.nr_slots = 1,
|
||||||
.dma_mask = 0xffffffff,
|
|
||||||
.slots[0] = {
|
.slots[0] = {
|
||||||
.set_power = mmc_set_power,
|
.set_power = mmc_set_power,
|
||||||
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
|
.ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34,
|
||||||
|
|
|
@ -185,7 +185,6 @@ static int nokia770_mmc_get_cover_state(struct device *dev, int slot)
|
||||||
|
|
||||||
static struct omap_mmc_platform_data nokia770_mmc2_data = {
|
static struct omap_mmc_platform_data nokia770_mmc2_data = {
|
||||||
.nr_slots = 1,
|
.nr_slots = 1,
|
||||||
.dma_mask = 0xffffffff,
|
|
||||||
.max_freq = 12000000,
|
.max_freq = 12000000,
|
||||||
.slots[0] = {
|
.slots[0] = {
|
||||||
.set_power = nokia770_mmc_set_power,
|
.set_power = nokia770_mmc_set_power,
|
||||||
|
|
|
@ -468,7 +468,6 @@ static struct omap_mmc_platform_data mmc1_data = {
|
||||||
.cleanup = n8x0_mmc_cleanup,
|
.cleanup = n8x0_mmc_cleanup,
|
||||||
.shutdown = n8x0_mmc_shutdown,
|
.shutdown = n8x0_mmc_shutdown,
|
||||||
.max_freq = 24000000,
|
.max_freq = 24000000,
|
||||||
.dma_mask = 0xffffffff,
|
|
||||||
.slots[0] = {
|
.slots[0] = {
|
||||||
.wires = 4,
|
.wires = 4,
|
||||||
.set_power = n8x0_mmc_set_power,
|
.set_power = n8x0_mmc_set_power,
|
||||||
|
|
|
@ -315,7 +315,6 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c,
|
||||||
mmc->slots[0].caps = c->caps;
|
mmc->slots[0].caps = c->caps;
|
||||||
mmc->slots[0].pm_caps = c->pm_caps;
|
mmc->slots[0].pm_caps = c->pm_caps;
|
||||||
mmc->slots[0].internal_clock = !c->ext_clock;
|
mmc->slots[0].internal_clock = !c->ext_clock;
|
||||||
mmc->dma_mask = 0xffffffff;
|
|
||||||
mmc->max_freq = c->max_freq;
|
mmc->max_freq = c->max_freq;
|
||||||
if (cpu_is_omap44xx())
|
if (cpu_is_omap44xx())
|
||||||
mmc->reg_offset = OMAP4_MMC_REG_OFFSET;
|
mmc->reg_offset = OMAP4_MMC_REG_OFFSET;
|
||||||
|
|
|
@ -81,8 +81,6 @@ struct omap_mmc_platform_data {
|
||||||
/* Return context loss count due to PM states changing */
|
/* Return context loss count due to PM states changing */
|
||||||
int (*get_context_loss_count)(struct device *dev);
|
int (*get_context_loss_count)(struct device *dev);
|
||||||
|
|
||||||
u64 dma_mask;
|
|
||||||
|
|
||||||
/* Integrating attributes from the omap_hwmod layer */
|
/* Integrating attributes from the omap_hwmod layer */
|
||||||
u8 controller_flags;
|
u8 controller_flags;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue