evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: slot-gpio: Allow host driver to provide isr for card-detect interrupts

Browse source 
One of the reasons omap_hsmmc doesn't use the slot-gpio library
is that it has some non-standard functionality in the card-detect
interrupt service routine.

To make it possible for omap_hsmmc (and maybe others) to be converted
to use slot-gpio, add 'mmc_gpio_request_cd_isr' which provide an
alternate isr to be register by the slot-gpio code.

Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
NeilBrown 2015-01-13 08:23:18 +13:00 • committed by Ulf Hansson
parent 94203042cd
commit c7ea834d81
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
drivers/mmc/core/slot-gpio.c
View file

@ -25,6 +25,7 @@ struct mmc_gpio {
struct gpio_desc *cd_gpio; struct gpio_desc *cd_gpio;
bool override_ro_active_level; bool override_ro_active_level;
bool override_cd_active_level; bool override_cd_active_level;
irqreturn_t (*cd_gpio_isr)(int irq, void *dev_id);
char *ro_label; char *ro_label;
char cd_label[0]; char cd_label[0];
}; };
@ -136,8 +137,10 @@ void mmc_gpiod_request_cd_irq(struct mmc_host *host)
irq = -EINVAL; irq = -EINVAL;
if (irq >= 0) { if (irq >= 0) {
if (!ctx->cd_gpio_isr)
ctx->cd_gpio_isr = mmc_gpio_cd_irqt;
ret = devm_request_threaded_irq(host->parent, irq, ret = devm_request_threaded_irq(host->parent, irq,
NULL, mmc_gpio_cd_irqt, NULL, ctx->cd_gpio_isr,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
ctx->cd_label, host); ctx->cd_label, host);
if (ret < 0) if (ret < 0)
@ -151,6 +154,19 @@ void mmc_gpiod_request_cd_irq(struct mmc_host *host)
} }
EXPORT_SYMBOL(mmc_gpiod_request_cd_irq); EXPORT_SYMBOL(mmc_gpiod_request_cd_irq);
/* Register an alternate interrupt service routine for
* the card-detect GPIO.
*/
void mmc_gpio_set_cd_isr(struct mmc_host *host,
irqreturn_t (*isr)(int irq, void *dev_id))
{
struct mmc_gpio *ctx = host->slot.handler_priv;
WARN_ON(ctx->cd_gpio_isr);
ctx->cd_gpio_isr = isr;
}
EXPORT_SYMBOL(mmc_gpio_set_cd_isr);
/** /**
* mmc_gpio_request_cd - request a gpio for card-detection * mmc_gpio_request_cd - request a gpio for card-detection
* @host: mmc host * @host: mmc host

2
include/linux/mmc/slot-gpio.h
View file

@ -26,6 +26,8 @@ int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id,
int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id, int mmc_gpiod_request_ro(struct mmc_host *host, const char *con_id,
unsigned int idx, bool override_active_level, unsigned int idx, bool override_active_level,
unsigned int debounce, bool *gpio_invert); unsigned int debounce, bool *gpio_invert);
void mmc_gpio_set_cd_isr(struct mmc_host *host,
irqreturn_t (*isr)(int irq, void *dev_id));
void mmc_gpiod_request_cd_irq(struct mmc_host *host); void mmc_gpiod_request_cd_irq(struct mmc_host *host);
#endif #endif