| Message ID | 1456779385-18996-1-git-send-email-dev@lynxeye.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 29/02/16 22:56, Lucas Stach wrote: > The new code to do the clock rate setting externally to the SDMMC > module has a shortcut to not propagate changes with a 0 rate to > the CAR by simply bailing out. This breaks proper cutting of the > card clock. Fix it by directly calling the correct sdhci function. > > Fixes: a8e326a911d3 "mmc: tegra: implement module external clock change" > Signed-off-by: Lucas Stach <dev@lynxeye.de> > --- > drivers/mmc/host/sdhci-tegra.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c > index 212d51f..46a6bd1 100644 > --- a/drivers/mmc/host/sdhci-tegra.c > +++ b/drivers/mmc/host/sdhci-tegra.c > @@ -194,7 +194,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) > unsigned long host_clk; > > if (!clock) > - return; > + return sdhci_set_clock(host, clock);; > > host_clk = tegra_host->ddr_signaling ? clock * 2 : clock; > clk_set_rate(pltfm_host->clk, host_clk); > Acked-by: Adrian Hunter <adrian.hunter@intel.com> -- 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
On 29 February 2016 at 21:56, Lucas Stach <dev@lynxeye.de> wrote: > The new code to do the clock rate setting externally to the SDMMC > module has a shortcut to not propagate changes with a 0 rate to > the CAR by simply bailing out. This breaks proper cutting of the > card clock. Fix it by directly calling the correct sdhci function. > > Fixes: a8e326a911d3 "mmc: tegra: implement module external clock change" > Signed-off-by: Lucas Stach <dev@lynxeye.de> Thanks, applied for fixes! Kind regards Uffe > --- > drivers/mmc/host/sdhci-tegra.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c > index 212d51f..46a6bd1 100644 > --- a/drivers/mmc/host/sdhci-tegra.c > +++ b/drivers/mmc/host/sdhci-tegra.c > @@ -194,7 +194,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) > unsigned long host_clk; > > if (!clock) > - return; > + return sdhci_set_clock(host, clock);; > > host_clk = tegra_host->ddr_signaling ? clock * 2 : clock; > clk_set_rate(pltfm_host->clk, host_clk); > -- > 2.5.0 > > -- > 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 -- 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
On 4 March 2016 at 10:41, Ulf Hansson <ulf.hansson@linaro.org> wrote: > On 29 February 2016 at 21:56, Lucas Stach <dev@lynxeye.de> wrote: >> The new code to do the clock rate setting externally to the SDMMC >> module has a shortcut to not propagate changes with a 0 rate to >> the CAR by simply bailing out. This breaks proper cutting of the >> card clock. Fix it by directly calling the correct sdhci function. >> >> Fixes: a8e326a911d3 "mmc: tegra: implement module external clock change" >> Signed-off-by: Lucas Stach <dev@lynxeye.de> > > Thanks, applied for fixes! > Unfortunate I failed to send this in a PR to Linus within the 4.5 rc cycle, apologize for the inconvenience! Instead I have this queued for 4.6 and I have added a stable tag to it. [...] Kind regards Uffe -- 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
On 29/02/16 20:56, Lucas Stach wrote: > The new code to do the clock rate setting externally to the SDMMC > module has a shortcut to not propagate changes with a 0 rate to > the CAR by simply bailing out. This breaks proper cutting of the > card clock. Fix it by directly calling the correct sdhci function. > > Fixes: a8e326a911d3 "mmc: tegra: implement module external clock change" > Signed-off-by: Lucas Stach <dev@lynxeye.de> > --- > drivers/mmc/host/sdhci-tegra.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c > index 212d51f..46a6bd1 100644 > --- a/drivers/mmc/host/sdhci-tegra.c > +++ b/drivers/mmc/host/sdhci-tegra.c > @@ -194,7 +194,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) > unsigned long host_clk; > > if (!clock) > - return; > + return sdhci_set_clock(host, clock);; Looks like the above adds an unnecessary additional semi-colon. Ulf, are you able to correct, or do you want a patch? Cheers Jon -- 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
On 17 March 2016 at 12:29, Jon Hunter <jonathanh@nvidia.com> wrote: > > On 29/02/16 20:56, Lucas Stach wrote: >> The new code to do the clock rate setting externally to the SDMMC >> module has a shortcut to not propagate changes with a 0 rate to >> the CAR by simply bailing out. This breaks proper cutting of the >> card clock. Fix it by directly calling the correct sdhci function. >> >> Fixes: a8e326a911d3 "mmc: tegra: implement module external clock change" >> Signed-off-by: Lucas Stach <dev@lynxeye.de> >> --- >> drivers/mmc/host/sdhci-tegra.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c >> index 212d51f..46a6bd1 100644 >> --- a/drivers/mmc/host/sdhci-tegra.c >> +++ b/drivers/mmc/host/sdhci-tegra.c >> @@ -194,7 +194,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) >> unsigned long host_clk; >> >> if (!clock) >> - return; >> + return sdhci_set_clock(host, clock);; > > Looks like the above adds an unnecessary additional semi-colon. > > Ulf, are you able to correct, or do you want a patch? Thanks for spotting this, I have amended the commit. No patch needed. Thanks! Kind regards Uffe -- 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/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index 212d51f..46a6bd1 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c @@ -194,7 +194,7 @@ static void tegra_sdhci_set_clock(struct sdhci_host *host, unsigned int clock) unsigned long host_clk; if (!clock) - return; + return sdhci_set_clock(host, clock);; host_clk = tegra_host->ddr_signaling ? clock * 2 : clock; clk_set_rate(pltfm_host->clk, host_clk);
The new code to do the clock rate setting externally to the SDMMC module has a shortcut to not propagate changes with a 0 rate to the CAR by simply bailing out. This breaks proper cutting of the card clock. Fix it by directly calling the correct sdhci function. Fixes: a8e326a911d3 "mmc: tegra: implement module external clock change" Signed-off-by: Lucas Stach <dev@lynxeye.de> --- drivers/mmc/host/sdhci-tegra.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)