mmc: matsushita-common: Properly handle pin voltage configuration

Factor out the regulator handling into set_ios and add support for
selecting pin configuration based on the voltage to support UHS modes.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/drivers/mmc/matsushita-common.c b/drivers/mmc/matsushita-common.c
index d5facd972fbf596615c6065bda4b4524e50ae314..b143f5c2296a25cf54f54b57a73609aff9ac88c1 100644 (file)
--- a/drivers/mmc/matsushita-common.c
+++ b/drivers/mmc/matsushita-common.c
@@ -10,6 +10,7 @@
 #include <fdtdec.h>
 #include <mmc.h>
 #include <dm.h>
+#include <dm/pinctrl.h>
 #include <linux/compat.h>
 #include <linux/dma-direction.h>
 #include <linux/io.h>
@@ -593,6 +594,46 @@ static void matsu_sd_set_clk_rate(struct matsu_sd_priv *priv,
        udelay(1000);
 }
 
+static void matsu_sd_set_pins(struct udevice *dev)
+{
+       __maybe_unused struct mmc *mmc = mmc_get_mmc_dev(dev);
+
+#ifdef CONFIG_DM_REGULATOR
+       struct matsu_sd_priv *priv = dev_get_priv(dev);
+
+       if (priv->vqmmc_dev) {
+               if (mmc->signal_voltage == MMC_SIGNAL_VOLTAGE_180)
+                       regulator_set_value(priv->vqmmc_dev, 1800000);
+               else
+                       regulator_set_value(priv->vqmmc_dev, 3300000);
+               regulator_set_enable(priv->vqmmc_dev, true);
+       }
+#endif
+
+#ifdef CONFIG_PINCTRL
+       switch (mmc->selected_mode) {
+       case MMC_LEGACY:
+       case SD_LEGACY:
+       case MMC_HS:
+       case SD_HS:
+       case MMC_HS_52:
+       case MMC_DDR_52:
+               pinctrl_select_state(dev, "default");
+               break;
+       case UHS_SDR12:
+       case UHS_SDR25:
+       case UHS_SDR50:
+       case UHS_DDR50:
+       case UHS_SDR104:
+       case MMC_HS_200:
+               pinctrl_select_state(dev, "state_uhs");
+               break;
+       default:
+               break;
+       }
+#endif
+}
+
 int matsu_sd_set_ios(struct udevice *dev)
 {
        struct matsu_sd_priv *priv = dev_get_priv(dev);
@@ -607,6 +648,7 @@ int matsu_sd_set_ios(struct udevice *dev)
                return ret;
        matsu_sd_set_ddr_mode(priv, mmc);
        matsu_sd_set_clk_rate(priv, mmc);
+       matsu_sd_set_pins(dev);
 
        return 0;
 }
@@ -671,9 +713,6 @@ int matsu_sd_probe(struct udevice *dev, u32 quirks)
        fdt_addr_t base;
        struct clk clk;
        int ret;
-#ifdef CONFIG_DM_REGULATOR
-       struct udevice *vqmmc_dev;
-#endif
 
        base = devfdt_get_addr(dev);
        if (base == FDT_ADDR_T_NONE)
@@ -684,12 +723,7 @@ int matsu_sd_probe(struct udevice *dev, u32 quirks)
                return -ENOMEM;
 
 #ifdef CONFIG_DM_REGULATOR
-       ret = device_get_supply_regulator(dev, "vqmmc-supply", &vqmmc_dev);
-       if (!ret) {
-               /* Set the regulator to 3.3V until we support 1.8V modes */
-               regulator_set_value(vqmmc_dev, 3300000);
-               regulator_set_enable(vqmmc_dev, true);
-       }
+       device_get_supply_regulator(dev, "vqmmc-supply", &priv->vqmmc_dev);
 #endif
 
        ret = clk_get_by_index(dev, 0, &clk);

diff --git a/drivers/mmc/matsushita-common.h b/drivers/mmc/matsushita-common.h
index 8c81bbcc4bcf0c7ffa4d6f660244acaa58fc78a5..b019b72b3e2c0d7d7870df25593e8ea8dbdd930d 100644 (file)
--- a/drivers/mmc/matsushita-common.h
+++ b/drivers/mmc/matsushita-common.h
@@ -130,6 +130,9 @@ struct matsu_sd_priv {
 #define MATSU_SD_CAP_RCAR_UHS          BIT(7)  /* Renesas RCar UHS/SDR modes */
 #define MATSU_SD_CAP_RCAR              \
        (MATSU_SD_CAP_RCAR_GEN2 | MATSU_SD_CAP_RCAR_GEN3)
+#ifdef CONFIG_DM_REGULATOR
+       struct udevice *vqmmc_dev;
+#endif
 };
 
 int matsu_sd_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,