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

Commit f5e2574e authored by Rabin Vincent's avatar Rabin Vincent Committed by Russell King
Browse files

ARM: 6239/1: mmci: let core poll for card detection 



Use the MMC core's ability to poll for card detection.  This also has
the advantage of doing the gpio_get_value from a workqueue instead of
timer, allowing the gpio to be on a sleeping gpiochip.

Acked-by: default avatarLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: default avatarRabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 528320db

drivers/mmc/host/mmci.c

+1 −21
Original line number Diff line number Diff line
@@ -567,18 +567,6 @@ static const struct mmc_host_ops mmci_ops = { 
	.get_cd		= mmci_get_cd,

};



static void mmci_check_status(unsigned long data)

{

	struct mmci_host *host = (struct mmci_host *)data;

	unsigned int status = mmci_get_cd(host->mmc);



	if (status ^ host->oldstat)

		mmc_detect_change(host->mmc, 0);



	host->oldstat = status;

	mod_timer(&host->timer, jiffies + HZ);

}



static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)

{

	struct mmci_platform_data *plat = dev->dev.platform_data;
@@ -685,6 +673,7 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) 
	if (host->vcc == NULL)

		mmc->ocr_avail = plat->ocr_mask;

	mmc->caps = plat->capabilities;

	mmc->caps |= MMC_CAP_NEEDS_POLL;



	/*

	 * We can do SGIO
@@ -750,7 +739,6 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) 
	writel(MCI_IRQENABLE, host->base + MMCIMASK0);



	amba_set_drvdata(dev, mmc);

	host->oldstat = mmci_get_cd(host->mmc);



	mmc_add_host(mmc);
@@ -758,12 +746,6 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id) 
		mmc_hostname(mmc), amba_rev(dev), amba_config(dev),

		(unsigned long long)dev->res.start, dev->irq[0], dev->irq[1]);



	init_timer(&host->timer);

	host->timer.data = (unsigned long)host;

	host->timer.function = mmci_check_status;

	host->timer.expires = jiffies + HZ;

	add_timer(&host->timer);



	return 0;



 irq0_free:
@@ -797,8 +779,6 @@ static int __devexit mmci_remove(struct amba_device *dev) 
	if (mmc) {

		struct mmci_host *host = mmc_priv(mmc);



		del_timer_sync(&host->timer);



		mmc_remove_host(mmc);



		writel(0, host->base + MMCIMASK0);