Message ID | 20161115101232.3854-10-jh80.chung@samsung.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
在 2016/11/15 18:12, Jaehoon Chung 写道: > The "clock-freq-min-max" property was deprecated. > There is "max-frequency" property in drivers/mmc/core/host.c > "max-frequency" can be replaced with "clock-freq-min-max". > Minimum clock value might be set to 100K by default. > Then MMC core should try to find the correct value from 400K to 100K. > So it just needs to set Maximum clock value. > This is what we talked about to do :-) Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com> > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> > --- > Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt | 3 ++- > drivers/mmc/host/dw_mmc.c | 2 ++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt > index bfa461a..1279a22 100644 > --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt > +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt > @@ -59,8 +59,9 @@ 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: Minimum and Maximum clock frequency for card output > +* 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: specifies the number of slots supported by the controller. > The number of physical slots actually used could be equal or less than the > diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c > index ec0ba79..48e968a 100644 > --- a/drivers/mmc/host/dw_mmc.c > +++ b/drivers/mmc/host/dw_mmc.c > @@ -2608,6 +2608,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) > 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]; > } >
On Tue, Nov 15, 2016 at 07:12:31PM +0900, Jaehoon Chung wrote: > The "clock-freq-min-max" property was deprecated. > There is "max-frequency" property in drivers/mmc/core/host.c > "max-frequency" can be replaced with "clock-freq-min-max". > Minimum clock value might be set to 100K by default. > Then MMC core should try to find the correct value from 400K to 100K. > So it just needs to set Maximum clock value. > > Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> > --- > Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt | 3 ++- > drivers/mmc/host/dw_mmc.c | 2 ++ > 2 files changed, 4 insertions(+), 1 deletion(-) Acked-by: Rob Herring <robh@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt index bfa461a..1279a22 100644 --- a/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt +++ b/Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt @@ -59,8 +59,9 @@ 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: Minimum and Maximum clock frequency for card output +* 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: specifies the number of slots supported by the controller. The number of physical slots actually used could be equal or less than the diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index ec0ba79..48e968a 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -2608,6 +2608,8 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) 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]; }
The "clock-freq-min-max" property was deprecated. There is "max-frequency" property in drivers/mmc/core/host.c "max-frequency" can be replaced with "clock-freq-min-max". Minimum clock value might be set to 100K by default. Then MMC core should try to find the correct value from 400K to 100K. So it just needs to set Maximum clock value. Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com> --- Documentation/devicetree/bindings/mmc/synopsys-dw-mshc.txt | 3 ++- drivers/mmc/host/dw_mmc.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-)