Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a23fa1b authored by Russell King's avatar Russell King
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4e078fbd

arch/arm/mach-omap1/board-h2-mmc.c

+0 −1
Original line number Diff line number Diff line
@@ -54,7 +54,6 @@ static struct omap_mmc_platform_data mmc1_data = { 
	.nr_slots                       = 1,

	.init				= mmc_late_init,

	.cleanup			= mmc_cleanup,

	.dma_mask			= 0xffffffff,

	.slots[0]       = {

		.set_power              = mmc_set_power,

		.ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,

arch/arm/mach-omap1/board-h3-mmc.c

+0 −1
Original line number Diff line number Diff line
@@ -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 = {

	.nr_slots                       = 1,

	.dma_mask			= 0xffffffff,

	.slots[0]       = {

		.set_power              = mmc_set_power,

		.ocr_mask               = MMC_VDD_32_33 | MMC_VDD_33_34,

arch/arm/mach-omap1/board-nokia770.c

+0 −1
Original line number Diff line number Diff line
@@ -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 = {

	.nr_slots                       = 1,

	.dma_mask			= 0xffffffff,

	.max_freq                       = 12000000,

	.slots[0]       = {

		.set_power		= nokia770_mmc_set_power,

arch/arm/mach-omap2/board-n8x0.c

+0 −1
Original line number Diff line number Diff line
@@ -468,7 +468,6 @@ static struct omap_mmc_platform_data mmc1_data = { 
	.cleanup			= n8x0_mmc_cleanup,

	.shutdown			= n8x0_mmc_shutdown,

	.max_freq			= 24000000,

	.dma_mask			= 0xffffffff,

	.slots[0] = {

		.wires			= 4,

		.set_power		= n8x0_mmc_set_power,

arch/arm/mach-omap2/hsmmc.c

+0 −1
Original line number Diff line number Diff line
@@ -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].pm_caps = c->pm_caps;

	mmc->slots[0].internal_clock = !c->ext_clock;

	mmc->dma_mask = 0xffffffff;

	mmc->max_freq = c->max_freq;

	if (cpu_is_omap44xx())

		mmc->reg_offset = OMAP4_MMC_REG_OFFSET;