mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
mmc: dw_mmc: Support SDIO interrupts for all slots
The Patch adds the support for SDIO interrupts for all slots. It includes enabling of SDIO interrupts through dw_mci_enable_sdio_irq and the handling of the slot specific interrupts in the Interrupt Service Routine. Signed-off-by: Shashidhar Hiremath <shashidharh@vayavyalabs.com> Acked-by: James Hogan <james.hogan@imgtec.com> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
parent
190657c9f4
commit
1a5c8e1f4f
2 changed files with 33 additions and 5 deletions
|
@ -764,11 +764,29 @@ static int dw_mci_get_cd(struct mmc_host *mmc)
|
||||||
return present;
|
return present;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void dw_mci_enable_sdio_irq(struct mmc_host *mmc, int enb)
|
||||||
|
{
|
||||||
|
struct dw_mci_slot *slot = mmc_priv(mmc);
|
||||||
|
struct dw_mci *host = slot->host;
|
||||||
|
u32 int_mask;
|
||||||
|
|
||||||
|
/* Enable/disable Slot Specific SDIO interrupt */
|
||||||
|
int_mask = mci_readl(host, INTMASK);
|
||||||
|
if (enb) {
|
||||||
|
mci_writel(host, INTMASK,
|
||||||
|
(int_mask | (1 << SDMMC_INT_SDIO(slot->id))));
|
||||||
|
} else {
|
||||||
|
mci_writel(host, INTMASK,
|
||||||
|
(int_mask & ~(1 << SDMMC_INT_SDIO(slot->id))));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static const struct mmc_host_ops dw_mci_ops = {
|
static const struct mmc_host_ops dw_mci_ops = {
|
||||||
.request = dw_mci_request,
|
.request = dw_mci_request,
|
||||||
.set_ios = dw_mci_set_ios,
|
.set_ios = dw_mci_set_ios,
|
||||||
.get_ro = dw_mci_get_ro,
|
.get_ro = dw_mci_get_ro,
|
||||||
.get_cd = dw_mci_get_cd,
|
.get_cd = dw_mci_get_cd,
|
||||||
|
.enable_sdio_irq = dw_mci_enable_sdio_irq,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void dw_mci_request_end(struct dw_mci *host, struct mmc_request *mrq)
|
static void dw_mci_request_end(struct dw_mci *host, struct mmc_request *mrq)
|
||||||
|
@ -1406,6 +1424,7 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
|
||||||
struct dw_mci *host = dev_id;
|
struct dw_mci *host = dev_id;
|
||||||
u32 status, pending;
|
u32 status, pending;
|
||||||
unsigned int pass_count = 0;
|
unsigned int pass_count = 0;
|
||||||
|
int i;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
status = mci_readl(host, RINTSTS);
|
status = mci_readl(host, RINTSTS);
|
||||||
|
@ -1477,6 +1496,15 @@ static irqreturn_t dw_mci_interrupt(int irq, void *dev_id)
|
||||||
queue_work(dw_mci_card_workqueue, &host->card_work);
|
queue_work(dw_mci_card_workqueue, &host->card_work);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Handle SDIO Interrupts */
|
||||||
|
for (i = 0; i < host->num_slots; i++) {
|
||||||
|
struct dw_mci_slot *slot = host->slot[i];
|
||||||
|
if (pending & SDMMC_INT_SDIO(i)) {
|
||||||
|
mci_writel(host, RINTSTS, SDMMC_INT_SDIO(i));
|
||||||
|
mmc_signal_sdio_irq(slot->mmc);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
} while (pass_count++ < 5);
|
} while (pass_count++ < 5);
|
||||||
|
|
||||||
#ifdef CONFIG_MMC_DW_IDMAC
|
#ifdef CONFIG_MMC_DW_IDMAC
|
||||||
|
|
|
@ -82,7 +82,7 @@
|
||||||
#define SDMMC_CTYPE_4BIT BIT(0)
|
#define SDMMC_CTYPE_4BIT BIT(0)
|
||||||
#define SDMMC_CTYPE_1BIT 0
|
#define SDMMC_CTYPE_1BIT 0
|
||||||
/* Interrupt status & mask register defines */
|
/* Interrupt status & mask register defines */
|
||||||
#define SDMMC_INT_SDIO BIT(16)
|
#define SDMMC_INT_SDIO(n) BIT(16 + (n))
|
||||||
#define SDMMC_INT_EBE BIT(15)
|
#define SDMMC_INT_EBE BIT(15)
|
||||||
#define SDMMC_INT_ACD BIT(14)
|
#define SDMMC_INT_ACD BIT(14)
|
||||||
#define SDMMC_INT_SBE BIT(13)
|
#define SDMMC_INT_SBE BIT(13)
|
||||||
|
|
Loading…
Reference in a new issue