Thread (16 messages) 16 messages, 2 authors, 2021-08-25

Re: [PATCH 1/6] mmc: sdhci-esdhc-imx: remove redundant code for manual tuning

From: Ulf Hansson <hidden>
Date: 2021-08-24 13:53:13
Also in: linux-arm-kernel, linux-mmc

On Mon, 16 Aug 2021 at 15:00, [off-list ref] wrote:
From: Haibo Chen <haibo.chen@nxp.com>

For manual tuning method, already call esdhc_prepare_tuning()
config the necessary registers, so remove the redundant code
in esdhc_writew_le() for SDHCI_HOST_CONTROL2.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
While discussions on the DT binding, etc, continue with Lucas and Rob
on patch 3 - do you want me to apply patch1 and patch2?

Kind regards
Uffe
quoted hunk ↗ jump to hunk
---
 drivers/mmc/host/sdhci-esdhc-imx.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c
index 57b19ca1ad6d..a49fac719fca 100644
--- a/drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -628,17 +628,7 @@ static void esdhc_writew_le(struct sdhci_host *host, u16 val, int reg)
                else
                        new_val &= ~ESDHC_VENDOR_SPEC_VSELECT;
                writel(new_val, host->ioaddr + ESDHC_VENDOR_SPEC);
-               if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) {
-                       new_val = readl(host->ioaddr + ESDHC_MIX_CTRL);
-                       if (val & SDHCI_CTRL_TUNED_CLK) {
-                               new_val |= ESDHC_MIX_CTRL_SMPCLK_SEL;
-                               new_val |= ESDHC_MIX_CTRL_AUTO_TUNE_EN;
-                       } else {
-                               new_val &= ~ESDHC_MIX_CTRL_SMPCLK_SEL;
-                               new_val &= ~ESDHC_MIX_CTRL_AUTO_TUNE_EN;
-                       }
-                       writel(new_val , host->ioaddr + ESDHC_MIX_CTRL);
-               } else if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
+               if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) {
                        u32 v = readl(host->ioaddr + SDHCI_AUTO_CMD_STATUS);
                        u32 m = readl(host->ioaddr + ESDHC_MIX_CTRL);
                        if (val & SDHCI_CTRL_TUNED_CLK) {
--
2.17.1
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help