mmc: add the MMC_CLK_ENABLE/DISABLE macro in mmc.h

mmc_set_clock() function has the disable argument as bool type.
When mmc_set_clock is called, it might be passed to "true" or "false".
But it's too confusion whether clock is enabled or disabled with only
"true" and "false".
To prevent the confusion, replace to MMC_CLK_ENABLE/DISABLE macro from
true/false.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/drivers/mmc/fsl_esdhc.c b/drivers/mmc/fsl_esdhc.c
index 1a006fa95f20261a31535c88ee97b06eccce1bd8..4528345c676202898a5dc62b773bf9b7aa1f5fac 100644 (file)
--- a/drivers/mmc/fsl_esdhc.c
+++ b/drivers/mmc/fsl_esdhc.c
@@ -982,7 +982,7 @@ static int esdhc_init_common(struct fsl_esdhc_priv *priv, struct mmc *mmc)
 #endif
 
        /* Set the initial clock speed */
-       mmc_set_clock(mmc, 400000, false);
+       mmc_set_clock(mmc, 400000, MMC_CLK_ENABLE);
 
        /* Disable the BRR and BWR bits in IRQSTAT */
        esdhc_clrbits32(&regs->irqstaten, IRQSTATEN_BRR | IRQSTATEN_BWR);

diff --git a/drivers/mmc/meson_gx_mmc.c b/drivers/mmc/meson_gx_mmc.c
index 0aea4770c5baab5b027c2079d3c8cfe731e8c9e7..332f1e12a58377dfcb8a7e8b963e9643e17265c0 100644 (file)
--- a/drivers/mmc/meson_gx_mmc.c
+++ b/drivers/mmc/meson_gx_mmc.c
@@ -252,7 +252,7 @@ static int meson_mmc_probe(struct udevice *dev)
        mmc->priv = pdata;
        upriv->mmc = mmc;
 
-       mmc_set_clock(mmc, cfg->f_min, false);
+       mmc_set_clock(mmc, cfg->f_min, MMC_CLK_ENABLE);
 
        /* reset all status bits */
        meson_write(mmc, STATUS_MASK, MESON_SD_EMMC_STATUS);

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 01a02fba63f47d8e992bc94ecb70cbfbc02fd9a4..29971a5047c9c31a8076aa2e64fcb7c0665a4fc8 100644 (file)
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -529,7 +529,7 @@ static int mmc_switch_voltage(struct mmc *mmc, int signal_voltage)
         * During a signal voltage level switch, the clock must be gated
         * for 5 ms according to the SD spec
         */
-       mmc_set_clock(mmc, mmc->clock, true);
+       mmc_set_clock(mmc, mmc->clock, MMC_CLK_DISABLE);
 
        err = mmc_set_signal_voltage(mmc, signal_voltage);
        if (err)
@@ -537,7 +537,7 @@ static int mmc_switch_voltage(struct mmc *mmc, int signal_voltage)
 
        /* Keep clock gated for at least 10 ms, though spec only says 5 ms */
        mdelay(10);
-       mmc_set_clock(mmc, mmc->clock, false);
+       mmc_set_clock(mmc, mmc->clock, MMC_CLK_ENABLE);
 
        /*
         * Failure to switch is indicated by the card holding
@@ -1672,7 +1672,8 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
 
                                /* configure the bus mode (host) */
                                mmc_select_mode(mmc, mwt->mode);
-                               mmc_set_clock(mmc, mmc->tran_speed, false);
+                               mmc_set_clock(mmc, mmc->tran_speed,
+                                               MMC_CLK_ENABLE);
 
 #ifdef MMC_SUPPORTS_TUNING
                                /* execute tuning if needed */
@@ -1697,7 +1698,8 @@ static int sd_select_mode_and_width(struct mmc *mmc, uint card_caps)
 error:
                                /* revert to a safer bus speed */
                                mmc_select_mode(mmc, SD_LEGACY);
-                               mmc_set_clock(mmc, mmc->tran_speed, false);
+                               mmc_set_clock(mmc, mmc->tran_speed,
+                                               MMC_CLK_ENABLE);
                        }
                }
        }
@@ -1858,7 +1860,7 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
                return -ENOTSUPP;
        }
 
-       mmc_set_clock(mmc, mmc->legacy_speed, false);
+       mmc_set_clock(mmc, mmc->legacy_speed, MMC_CLK_ENABLE);
 
        for_each_mmc_mode_by_pref(card_caps, mwt) {
                for_each_supported_width(card_caps & mwt->widths,
@@ -1901,7 +1903,7 @@ static int mmc_select_mode_and_width(struct mmc *mmc, uint card_caps)
 
                        /* configure the bus mode (host) */
                        mmc_select_mode(mmc, mwt->mode);
-                       mmc_set_clock(mmc, mmc->tran_speed, false);
+                       mmc_set_clock(mmc, mmc->tran_speed, MMC_CLK_ENABLE);
 #ifdef MMC_SUPPORTS_TUNING
 
                        /* execute tuning if needed */
@@ -2426,7 +2428,7 @@ static void mmc_set_initial_state(struct mmc *mmc)
 
        mmc_select_mode(mmc, MMC_LEGACY);
        mmc_set_bus_width(mmc, 1);
-       mmc_set_clock(mmc, 0, false);
+       mmc_set_clock(mmc, 0, MMC_CLK_ENABLE);
 }
 
 static int mmc_power_on(struct mmc *mmc)
@@ -2446,7 +2448,7 @@ static int mmc_power_on(struct mmc *mmc)
 
 static int mmc_power_off(struct mmc *mmc)
 {
-       mmc_set_clock(mmc, 0, true);
+       mmc_set_clock(mmc, 0, MMC_CLK_DISABLE);
 #if CONFIG_IS_ENABLED(DM_MMC) && CONFIG_IS_ENABLED(DM_REGULATOR)
        if (mmc->vmmc_supply) {
                int ret = regulator_set_enable(mmc->vmmc_supply, false);

diff --git a/include/mmc.h b/include/mmc.h
index d9611a0e9b5d1536ff3d946c058badc09252821d..534c317b43c46ed6aae5d2c7fcc1a4caadf7b39a 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -707,6 +707,9 @@ int mmc_voltage_to_mv(enum mmc_voltage voltage);
  */
 int mmc_set_clock(struct mmc *mmc, uint clock, bool disable);
 
+#define MMC_CLK_ENABLE         false
+#define MMC_CLK_DISABLE                true
+
 struct mmc *find_mmc_device(int dev_num);
 int mmc_set_dev(int dev_num);
 void print_mmc_devices(char separator);