diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-18 15:26:12 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-11-21 08:00:13 +0100 |
| commit | 56d912bd33362365773cc6e51d9726d24cc112a9 (patch) | |
| tree | abd52d94625d6e6521c7d5359995fcc132819c8b /drivers/mci/mci-bcm2835.c | |
| parent | ee2ed910f75445e03b38cae607f0242c01c9a66b (diff) | |
| download | barebox-56d912bd33362365773cc6e51d9726d24cc112a9.tar.gz barebox-56d912bd33362365773cc6e51d9726d24cc112a9.tar.xz | |
mci: sdhci: remove duplicate register defines for interrupt bits
We have duplicate bit defines for the interrupt bits. Remove the duplicates.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/mci/mci-bcm2835.c')
| -rw-r--r-- | drivers/mci/mci-bcm2835.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mci/mci-bcm2835.c b/drivers/mci/mci-bcm2835.c index a16d192832..cb72235807 100644 --- a/drivers/mci/mci-bcm2835.c +++ b/drivers/mci/mci-bcm2835.c @@ -109,18 +109,18 @@ static int bcm2835_mci_transfer_data(struct bcm2835_mci_host *host, if (data->flags & MMC_DATA_READ) { p = (u32 *) data->dest; - data_ready_intr_mask = IRQSTAT_BRR; + data_ready_intr_mask = SDHCI_INT_DATA_AVAIL; data_ready_status_mask = PRSSTAT_BREN; read_write_func = &sdhci_read32_data; } else { p = (u32 *) data->src; - data_ready_intr_mask = IRQSTAT_BWR; + data_ready_intr_mask = SDHCI_INT_SPACE_AVAIL; data_ready_status_mask = PRSSTAT_BWEN; read_write_func = &sdhci_write32_data; } do { intr_status = sdhci_read32(&host->sdhci, SDHCI_INT_STATUS); - if (intr_status & IRQSTAT_CIE) { + if (intr_status & SDHCI_INT_INDEX) { dev_err(host->hw_dev, "Error occured while transferring data: 0x%X\n", intr_status); @@ -139,7 +139,7 @@ static int bcm2835_mci_transfer_data(struct bcm2835_mci_host *host, data_size -= 4; } } - } while ((intr_status & IRQSTAT_TC) == 0); + } while ((intr_status & SDHCI_INT_XFER_COMPLETE) == 0); if (data_size != 0) { if (data->flags & MMC_DATA_READ) @@ -166,9 +166,9 @@ static u32 bcm2835_mci_wait_command_done(struct bcm2835_mci_host *host) while (true) { interrupt = sdhci_read32(&host->sdhci, SDHCI_INT_STATUS); - if (interrupt & IRQSTAT_CIE) + if (interrupt & SDHCI_INT_INDEX) return -EPERM; - if (interrupt & IRQSTAT_CC) + if (interrupt & SDHCI_INT_CMD_COMPLETE) break; } return 0; @@ -262,7 +262,7 @@ static int bcm2835_mci_request(struct mci_host *mci, struct mci_cmd *cmd, if (cmd->resp_type != 0 && ret != -1) { sdhci_read_response(&host->sdhci, cmd); - sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, IRQSTAT_CC); + sdhci_write32(&host->sdhci, SDHCI_INT_STATUS, SDHCI_INT_CMD_COMPLETE); } if (!ret && data) |