Re: [PATCH 1/6] mmc: dw_mmc: remove the deprecated "clock-freq-min-max" property

[Jaehoon Chung]

On 03/15/2018 07:22 PM, Ulf Hansson wrote:
> On 23 February 2018 at 07:41, Jaehoon Chung <jh80.chung@xxxxxxxxxxx> wrote:
>> '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@xxxxxxxxxxx>
> 
> Thanks, applied for next!

Sorry. Thanks for applying this. :)

Best Regards,
Jaehoon Chung

> 
> Kind regards
> Uffe
> 
>> ---
>>  .../devicetree/bindings/mmc/synopsys-dw-mshc.txt          |  4 ----
>>  drivers/mmc/host/dw_mmc.c                                 | 15 ++++-----------
>>  2 files changed, 4 insertions(+), 15 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt
>> index ef3e5f14067a..75c9fdca4aaf 100644
>> --- 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 0aa39975f33b..38e0e7c4ffd9 100644
>> --- a/drivers/mmc/host/dw_mmc.c
>> +++ b/drivers/mmc/host/dw_mmc.c
>> @@ -2784,7 +2784,6 @@ static int dw_mci_init_slot(struct dw_mci *host)
>>         struct dw_mci_slot *slot;
>>         const struct dw_mci_drv_data *drv_data = host->drv_data;
>>         int ctrl_id, ret;
>> -       u32 freq[2];
>>
>>         mmc = mmc_alloc_host(sizeof(struct dw_mci_slot), host->dev);
>>         if (!mmc)
>> @@ -2798,16 +2797,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);
>> @@ -2846,6 +2835,10 @@ static int dw_mci_init_slot(struct dw_mci *host)
>>         if (ret)
>>                 goto err_host_allocated;
>>
>> +       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;
>> --
>> 2.15.1
>>
> 
> 
>