mmc: dw_mmc: remove the deprecated "clock-freq-min-max" property

'clock-freq-min-max' property had already deprecated.
Remove the 'clock-freq-min-max' property that is kept to maintain
the compatibility.

Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
index ef3e5f1..75c9fdc 100644 (file)
--- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
+++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
@@ -59,10 +59,6 @@ Optional properties:
   is specified and the ciu clock is specified then we'll try to set the ciu
   clock to this at probe time.
 
-* clock-freq-min-max (DEPRECATED): Minimum and Maximum clock frequency for card output
-  clock(cclk_out). If it's not specified, max is 200MHZ and min is 400KHz by default.
-         (Use the "max-frequency" instead of "clock-freq-min-max".)
-
 * num-slots (DEPRECATED): specifies the number of slots supported by the controller.
   The number of physical slots actually used could be equal or less than the
   value specified by num-slots. If this property is not specified, the value

diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c
index 09ed242..b07135e 100644 (file)
--- a/drivers/mmc/host/dw_mmc.c
+++ b/drivers/mmc/host/dw_mmc.c
@@ -2799,6 +2799,10 @@ static int dw_mci_init_slot_caps(struct dw_mci_slot *slot)
        if (host->pdata->caps2)
                mmc->caps2 = host->pdata->caps2;
 
+       mmc->f_min = DW_MCI_FREQ_MIN;
+       if (!mmc->f_max)
+               mmc->f_max = DW_MCI_FREQ_MAX;
+
        /* Process SDIO IRQs through the sdio_irq_work. */
        if (mmc->caps & MMC_CAP_SDIO_IRQ)
                mmc->caps2 |= MMC_CAP2_SDIO_IRQ_NOTHREAD;
@@ -2811,7 +2815,6 @@ static int dw_mci_init_slot(struct dw_mci *host)
        struct mmc_host *mmc;
        struct dw_mci_slot *slot;
        int ret;
-       u32 freq[2];
 
        mmc = mmc_alloc_host(sizeof(struct dw_mci_slot), host->dev);
        if (!mmc)
@@ -2825,16 +2828,6 @@ static int dw_mci_init_slot(struct dw_mci *host)
        host->slot = slot;
 
        mmc->ops = &dw_mci_ops;
-       if (device_property_read_u32_array(host->dev, "clock-freq-min-max",
-                                          freq, 2)) {
-               mmc->f_min = DW_MCI_FREQ_MIN;
-               mmc->f_max = DW_MCI_FREQ_MAX;
-       } else {
-               dev_info(host->dev,
-                       "'clock-freq-min-max' property was deprecated.\n");
-               mmc->f_min = freq[0];
-               mmc->f_max = freq[1];
-       }
 
        /*if there are external regulators, get them*/
        ret = mmc_regulator_get_supply(mmc);