Signed-off-by: Michael Trimarchi michael@amarulasolutions.com --- drivers/mmc/dw_mmc.c | 4 ++-- include/dwmmc.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index ebe7bcdd90..e5b532a862 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -86,7 +86,7 @@ static void dwmci_prepare_data(struct dwmci_host *host, flush_dcache_range(data_start, roundup(data_end, ARCH_DMA_MINALIGN));
ctrl = dwmci_readl(host, DWMCI_CTRL); - ctrl |= DWMCI_IDMAC_EN | DWMCI_DMA_EN; + ctrl |= DWMCI_CTRL_USE_IDMAC | DWMCI_CTRL_DMA_EN; dwmci_writel(host, DWMCI_CTRL, ctrl);
ctrl = dwmci_readl(host, DWMCI_BMOD); @@ -383,7 +383,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, dwmci_writel(host, DWMCI_IDSTS, DWMCI_IDINTEN_MASK);
ctrl = dwmci_readl(host, DWMCI_CTRL); - ctrl &= ~(DWMCI_DMA_EN); + ctrl &= ~(DWMCI_CTRL_DMA_EN); dwmci_writel(host, DWMCI_CTRL, ctrl); bounce_buffer_stop(&bbstate); } diff --git a/include/dwmmc.h b/include/dwmmc.h index f06720dc0d..2f57b6e774 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -75,9 +75,9 @@ #define DWMCI_CTRL_RESET (1 << 0) #define DWMCI_CTRL_FIFO_RESET (1 << 1) #define DWMCI_CTRL_DMA_RESET (1 << 2) -#define DWMCI_DMA_EN (1 << 5) +#define DWMCI_CTRL_DMA_EN (1 << 5) #define DWMCI_CTRL_SEND_AS_CCSD (1 << 10) -#define DWMCI_IDMAC_EN (1 << 25) +#define DWMCI_CTRL_USE_IDMAC (1 << 25) #define DWMCI_RESET_ALL (DWMCI_CTRL_RESET | DWMCI_CTRL_FIFO_RESET |\ DWMCI_CTRL_DMA_RESET)