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

Commit fc307df8 authored by Balaji T K's avatar Balaji T K Committed by Chris Ball
Browse files

mmc: omap_hsmmc: fix module re-insertion 



OMAP4 and OMAP3 HSMMC IP registers differ by 0x100 offset.
Adding the offset to platform_device resource structure
increments the start address for every insmod operation.
MMC command fails on re-insertion as module due to incorrect register
base.  Fix this by updating the ioremap base address only.

Signed-off-by: default avatarBalaji T K <balajitk@ti.com>
Signed-off-by: default avatarVenkatraman S <svenkatr@ti.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent b796450b

drivers/mmc/host/omap_hsmmc.c

+1 −3
Original line number Diff line number Diff line
@@ -1818,8 +1818,6 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev) 
	if (res == NULL || irq < 0)

		return -ENXIO;



	res->start += pdata->reg_offset;

	res->end += pdata->reg_offset;

	res = request_mem_region(res->start, resource_size(res), pdev->name);

	if (res == NULL)

		return -EBUSY;
@@ -1843,7 +1841,7 @@ static int __devinit omap_hsmmc_probe(struct platform_device *pdev) 
	host->dma_ch	= -1;

	host->irq	= irq;

	host->slot_id	= 0;

	host->mapbase	= res->start;

	host->mapbase	= res->start + pdata->reg_offset;

	host->base	= ioremap(host->mapbase, SZ_4K);

	host->power_mode = MMC_POWER_OFF;

	host->next_data.cookie = 1;