diff options
author | Andreas Fenkart <afenkart@gmail.com> | 2015-03-03 07:28:18 -0500 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2015-03-31 10:50:44 -0400 |
commit | e03de74516ec434aea77cfcf276df9c87fc7285a (patch) | |
tree | f032e330c36eaaf82d3cedcff90a20c5b37dad8f | |
parent | 11227d12397c6dd5c578e27210aa14e3fa44f11c (diff) |
mmc: omap_hsmmc: use generic slot-gpio isr to manage card detect pin
Signed-off-by: Andreas Fenkart <afenkart@gmail.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index ea7028517124..9df2b6801f76 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -418,7 +418,6 @@ static inline int omap_hsmmc_have_reg(void) | |||
418 | 418 | ||
419 | #endif | 419 | #endif |
420 | 420 | ||
421 | static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id); | ||
422 | static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id); | 421 | static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id); |
423 | 422 | ||
424 | static int omap_hsmmc_gpio_init(struct mmc_host *mmc, | 423 | static int omap_hsmmc_gpio_init(struct mmc_host *mmc, |
@@ -440,7 +439,6 @@ static int omap_hsmmc_gpio_init(struct mmc_host *mmc, | |||
440 | return ret; | 439 | return ret; |
441 | 440 | ||
442 | host->card_detect = omap_hsmmc_card_detect; | 441 | host->card_detect = omap_hsmmc_card_detect; |
443 | mmc_gpio_set_cd_isr(mmc, omap_hsmmc_detect); | ||
444 | } | 442 | } |
445 | 443 | ||
446 | if (gpio_is_valid(pdata->gpio_wp)) { | 444 | if (gpio_is_valid(pdata->gpio_wp)) { |
@@ -1249,17 +1247,6 @@ static irqreturn_t omap_hsmmc_cover_irq(int irq, void *dev_id) | |||
1249 | return IRQ_HANDLED; | 1247 | return IRQ_HANDLED; |
1250 | } | 1248 | } |
1251 | 1249 | ||
1252 | /* | ||
1253 | * irq handler to notify the core about card insertion/removal | ||
1254 | */ | ||
1255 | static irqreturn_t omap_hsmmc_detect(int irq, void *dev_id) | ||
1256 | { | ||
1257 | struct omap_hsmmc_host *host = dev_id; | ||
1258 | |||
1259 | mmc_detect_change(host->mmc, (HZ * 200) / 1000); | ||
1260 | return IRQ_HANDLED; | ||
1261 | } | ||
1262 | |||
1263 | static void omap_hsmmc_dma_callback(void *param) | 1250 | static void omap_hsmmc_dma_callback(void *param) |
1264 | { | 1251 | { |
1265 | struct omap_hsmmc_host *host = param; | 1252 | struct omap_hsmmc_host *host = param; |