redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: 6309/1: mmci: allow neither ->status nor gpio_cd to be specified

Browse source 
The card may be always present on the board, and for these cases neither
a status callback nor a card detect GPIO is required, and card detection
polling can be disabled.

Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Rabin Vincent <rabin.vincent@stericsson.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Rabin Vincent 2010-08-09 12:56:40 +01:00 committed by Russell King
parent 148b8b39c1
commit 4b8caec095
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
drivers/mmc/host/mmci.c
View file

@ -589,9 +589,12 @@ static int mmci_get_cd(struct mmc_host *mmc)
struct mmci_platform_data *plat = host->plat; struct mmci_platform_data *plat = host->plat;
unsigned int status; unsigned int status;
if (host->gpio_cd == -ENOSYS) if (host->gpio_cd == -ENOSYS) {
if (!plat->status)
return 1; /* Assume always present */
status = plat->status(mmc_dev(host->mmc)); status = plat->status(mmc_dev(host->mmc));
else } else
status = !!gpio_get_value(host->gpio_cd) ^ plat->cd_invert; status = !!gpio_get_value(host->gpio_cd) ^ plat->cd_invert;
/* /*
@ -787,7 +790,8 @@ static int __devinit mmci_probe(struct amba_device *dev, struct amba_id *id)
goto err_gpio_wp; goto err_gpio_wp;
} }
if (host->gpio_cd_irq < 0) if ((host->plat->status || host->gpio_cd != -ENOSYS)
&& host->gpio_cd_irq < 0)
mmc->caps |= MMC_CAP_NEEDS_POLL; mmc->caps |= MMC_CAP_NEEDS_POLL;
ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host); ret = request_irq(dev->irq[0], mmci_irq, IRQF_SHARED, DRIVER_NAME " (cmd)", host);