aleph/lkl_linux
1
0
Fork 0
mirror of https://github.com/lkl/linux.git synced 2025-12-19 16:13:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

mmc: core: support setting card detect interrupt from drivers

Browse Source 
On certain platforms like Amlogic Meson gpiod_to_irq() isn't supported
due to the design of gpio / interrupt controller. Therefore provide an
option for drivers to pass the card detect interrupt number
(retrieved e.g. from device tree) to mmc core.

Suggested-by refers to the mechanism to pass and store the interrupt.

Suggested-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Link: https://lore.kernel.org/r/5777f38b-465f-ce48-a87f-5eb8b3c57b0a@gmail.com
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Heiner Kallweit
2023-02-14 22:41:19 +01:00
committed by Ulf Hansson
parent 9e622229bb
commit 88f94c782b
2 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/mmc/core/slot-gpio.c
View File

@@ -23,6 +23,7 @@ struct mmc_gpio {
char *ro_label; char *ro_label;
char *cd_label; char *cd_label;
u32 cd_debounce_delay_ms; u32 cd_debounce_delay_ms;
int cd_irq;
}; };
static irqreturn_t mmc_gpio_cd_irqt(int irq, void *dev_id) static irqreturn_t mmc_gpio_cd_irqt(int irq, void *dev_id)
@@ -53,12 +54,24 @@ int mmc_gpio_alloc(struct mmc_host *host)
ctx->ro_label = devm_kasprintf(host->parent, GFP_KERNEL, "%s ro", devname); ctx->ro_label = devm_kasprintf(host->parent, GFP_KERNEL, "%s ro", devname);
if (!ctx->ro_label) if (!ctx->ro_label)
return -ENOMEM; return -ENOMEM;
ctx->cd_irq = -EINVAL;
host->slot.handler_priv = ctx; host->slot.handler_priv = ctx;
host->slot.cd_irq = -EINVAL; host->slot.cd_irq = -EINVAL;
return 0; return 0;
} }
void mmc_gpio_set_cd_irq(struct mmc_host *host, int irq)
{
struct mmc_gpio *ctx = host->slot.handler_priv;
if (!ctx || irq < 0)
return;
ctx->cd_irq = irq;
}
EXPORT_SYMBOL(mmc_gpio_set_cd_irq);
int mmc_gpio_get_ro(struct mmc_host *host) int mmc_gpio_get_ro(struct mmc_host *host)
{ {
struct mmc_gpio *ctx = host->slot.handler_priv; struct mmc_gpio *ctx = host->slot.handler_priv;
@@ -98,7 +111,9 @@ void mmc_gpiod_request_cd_irq(struct mmc_host *host)
* Do not use IRQ if the platform prefers to poll, e.g., because that * Do not use IRQ if the platform prefers to poll, e.g., because that
* IRQ number is already used by another unit and cannot be shared. * IRQ number is already used by another unit and cannot be shared.
*/ */
if (!(host->caps & MMC_CAP_NEEDS_POLL)) if (ctx->cd_irq >= 0)
irq = ctx->cd_irq;
else if (!(host->caps & MMC_CAP_NEEDS_POLL))
irq = gpiod_to_irq(ctx->cd_gpio); irq = gpiod_to_irq(ctx->cd_gpio);
if (irq >= 0) { if (irq >= 0) {

1
include/linux/mmc/slot-gpio.h
View File

@@ -15,6 +15,7 @@ struct mmc_host;
int mmc_gpio_get_ro(struct mmc_host *host); int mmc_gpio_get_ro(struct mmc_host *host);
int mmc_gpio_get_cd(struct mmc_host *host); int mmc_gpio_get_cd(struct mmc_host *host);
void mmc_gpio_set_cd_irq(struct mmc_host *host, int irq);
int mmc_gpiod_request_cd(struct mmc_host *host, const char *con_id, int mmc_gpiod_request_cd(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); unsigned int debounce);