mmc: sdhci: Rename SDHCI_ACMD12_ERR and SDHCI_INT_ACMD12ERR

BugLink: https://bugs.launchpad.net/bugs/1838349
[ Upstream commit 869f8a69bb3a4aec4eb914a330d4ba53a9eed495 ]

The SDHCI_ACMD12_ERR register is used for auto-CMD23 and auto-CMD12
errors, as is the SDHCI_INT_ACMD12ERR interrupt bit. Rename them to
SDHCI_AUTO_CMD_STATUS and SDHCI_INT_AUTO_CMD_ERR respectively.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>

diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index ff5c4ad37a3a7ef6cdf9300775265cd9591a36e0..8c0b80a54e4debe3cd28de7fbfc9d9837a00f067 100644 (file)
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -425,7 +425,7 @@ static u16 esdhc_readw_le(struct sdhci_host *host, int reg)
                                val = readl(host->ioaddr + ESDHC_MIX_CTRL);
                        else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING)
                                /* the std tuning bits is in ACMD12_ERR for imx6sl */
-                               val = readl(host->ioaddr + SDHCI_ACMD12_ERR);
+                               val = readl(host->ioaddr + SDHCI_AUTO_CMD_STATUS);
                }
 
                if (val & ESDHC_MIX_CTRL_EXE_TUNE)
@@ -490,7 +490,7 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                        }
                        writel(new_val , host->ioaddr + ESDHC_MIX_CTRL);
                } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
-                       u32 v = readl(host->ioaddr + SDHCI_ACMD12_ERR);
+                       u32 v = readl(host->ioaddr + SDHCI_AUTO_CMD_STATUS);
                        u32 m = readl(host->ioaddr + ESDHC_MIX_CTRL);
                        if (val & SDHCI_CTRL_TUNED_CLK) {
                                v |= ESDHC_MIX_CTRL_SMPCLK_SEL;
@@ -508,7 +508,7 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                                v &= ~ESDHC_MIX_CTRL_EXE_TUNE;
                        }
 
-                       writel(v, host->ioaddr + SDHCI_ACMD12_ERR);
+                       writel(v, host->ioaddr + SDHCI_AUTO_CMD_STATUS);
                        writel(m, host->ioaddr + ESDHC_MIX_CTRL);
                }
                return;
@@ -937,9 +937,9 @@ static void esdhc_reset_tuning(struct sdhci_host *host)
                        writel(ctrl, host->ioaddr + ESDHC_MIX_CTRL);
                        writel(0, host->ioaddr + ESDHC_TUNE_CTRL_STATUS);
                } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
-                       ctrl = readl(host->ioaddr + SDHCI_ACMD12_ERR);
+                       ctrl = readl(host->ioaddr + SDHCI_AUTO_CMD_STATUS);
                        ctrl &= ~ESDHC_MIX_CTRL_SMPCLK_SEL;
-                       writel(ctrl, host->ioaddr + SDHCI_ACMD12_ERR);
+                       writel(ctrl, host->ioaddr + SDHCI_AUTO_CMD_STATUS);
                }
        }
 }
@@ -1303,7 +1303,7 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev)
 
                /* clear tuning bits in case ROM has set it already */
                writel(0x0, host->ioaddr + ESDHC_MIX_CTRL);
-               writel(0x0, host->ioaddr + SDHCI_ACMD12_ERR);
+               writel(0x0, host->ioaddr + SDHCI_AUTO_CMD_STATUS);
                writel(0x0, host->ioaddr + ESDHC_TUNE_CTRL_STATUS);
        }
 

diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 7625cd38774301ea24c57fcacf2bc37e465fc5a6..765160665f5566985c774974a8a857c8423225f8 100644 (file)
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -82,8 +82,8 @@ void sdhci_dumpregs(struct sdhci_host *host)
        SDHCI_DUMP("Int enab:  0x%08x | Sig enab: 0x%08x\n",
                   sdhci_readl(host, SDHCI_INT_ENABLE),
                   sdhci_readl(host, SDHCI_SIGNAL_ENABLE));
-       SDHCI_DUMP("AC12 err:  0x%08x | Slot int: 0x%08x\n",
-                  sdhci_readw(host, SDHCI_ACMD12_ERR),
+       SDHCI_DUMP("ACmd stat: 0x%08x | Slot int: 0x%08x\n",
+                  sdhci_readw(host, SDHCI_AUTO_CMD_STATUS),
                   sdhci_readw(host, SDHCI_SLOT_INT_STATUS));
        SDHCI_DUMP("Caps:      0x%08x | Caps_1:   0x%08x\n",
                   sdhci_readl(host, SDHCI_CAPABILITIES),

diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 1d7d61e25dbf0787670daba486dc1b7fd5032592..860b2c729e685fb19bddae209a47d6b9c6941a83 100644 (file)
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -144,7 +144,7 @@
 #define  SDHCI_INT_DATA_CRC    0x00200000
 #define  SDHCI_INT_DATA_END_BIT        0x00400000
 #define  SDHCI_INT_BUS_POWER   0x00800000
-#define  SDHCI_INT_ACMD12ERR   0x01000000
+#define  SDHCI_INT_AUTO_CMD_ERR        0x01000000
 #define  SDHCI_INT_ADMA_ERROR  0x02000000
 
 #define  SDHCI_INT_NORMAL_MASK 0x00007FFF
@@ -166,7 +166,7 @@
 
 #define SDHCI_CQE_INT_MASK (SDHCI_CQE_INT_ERR_MASK | SDHCI_INT_CQE)
 
-#define SDHCI_ACMD12_ERR       0x3C
+#define SDHCI_AUTO_CMD_STATUS  0x3C
 
 #define SDHCI_HOST_CONTROL2            0x3E
 #define  SDHCI_CTRL_UHS_MASK           0x0007