| Message ID | 20200519164251.5430-1-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] mmc: renesas_sdhi: remove manual clk handling | expand |
On Tue, 19 May 2020 at 18:42, Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > > The SDHI driver en-/disabled its main clock on its own, e.g. during > probe() and remove(). Now, we leave all handling to RPM. > > clk_summary before: > sd0 1 1 0 12480000 0 0 50000 > sdif0 2 2 0 12480000 0 0 50000 > > clk_summary after: > sd0 1 1 0 12480000 0 0 50000 > sdif0 1 1 0 12480000 0 0 50000 > > Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Applied for next, thanks! Kind regards Uffe > --- > > Depends on mmc/next + "[PATCH 2/2] mmc: tmio: Make sure the PM domain is > 'started' while probing" from Ulf > > Changes since v1: > > * reworded commit message > * don't remove the en-/disable calls themselves but only the clk_* calls > to the main clock > > > drivers/mmc/host/renesas_sdhi_core.c | 10 ++-------- > 1 file changed, 2 insertions(+), 8 deletions(-) > > diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c > index dcba9ad35dd1..15e21894bd44 100644 > --- a/drivers/mmc/host/renesas_sdhi_core.c > +++ b/drivers/mmc/host/renesas_sdhi_core.c > @@ -83,16 +83,11 @@ static int renesas_sdhi_clk_enable(struct tmio_mmc_host *host) > { > struct mmc_host *mmc = host->mmc; > struct renesas_sdhi *priv = host_to_priv(host); > - int ret = clk_prepare_enable(priv->clk); > - > - if (ret < 0) > - return ret; > + int ret; > > ret = clk_prepare_enable(priv->clk_cd); > - if (ret < 0) { > - clk_disable_unprepare(priv->clk); > + if (ret < 0) > return ret; > - } > > /* > * The clock driver may not know what maximum frequency > @@ -198,7 +193,6 @@ static void renesas_sdhi_clk_disable(struct tmio_mmc_host *host) > { > struct renesas_sdhi *priv = host_to_priv(host); > > - clk_disable_unprepare(priv->clk); > clk_disable_unprepare(priv->clk_cd); > } > > -- > 2.20.1 >
On Tue, May 19, 2020 at 6:42 PM Wolfram Sang <wsa+renesas@sang-engineering.com> wrote: > The SDHI driver en-/disabled its main clock on its own, e.g. during > probe() and remove(). Now, we leave all handling to RPM. > > clk_summary before: > sd0 1 1 0 12480000 0 0 50000 > sdif0 2 2 0 12480000 0 0 50000 > > clk_summary after: > sd0 1 1 0 12480000 0 0 50000 > sdif0 1 1 0 12480000 0 0 50000 > > Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
diff --git a/drivers/mmc/host/renesas_sdhi_core.c b/drivers/mmc/host/renesas_sdhi_core.c index dcba9ad35dd1..15e21894bd44 100644 --- a/drivers/mmc/host/renesas_sdhi_core.c +++ b/drivers/mmc/host/renesas_sdhi_core.c @@ -83,16 +83,11 @@ static int renesas_sdhi_clk_enable(struct tmio_mmc_host *host) { struct mmc_host *mmc = host->mmc; struct renesas_sdhi *priv = host_to_priv(host); - int ret = clk_prepare_enable(priv->clk); - - if (ret < 0) - return ret; + int ret; ret = clk_prepare_enable(priv->clk_cd); - if (ret < 0) { - clk_disable_unprepare(priv->clk); + if (ret < 0) return ret; - } /* * The clock driver may not know what maximum frequency @@ -198,7 +193,6 @@ static void renesas_sdhi_clk_disable(struct tmio_mmc_host *host) { struct renesas_sdhi *priv = host_to_priv(host); - clk_disable_unprepare(priv->clk); clk_disable_unprepare(priv->clk_cd); }
The SDHI driver en-/disabled its main clock on its own, e.g. during probe() and remove(). Now, we leave all handling to RPM. clk_summary before: sd0 1 1 0 12480000 0 0 50000 sdif0 2 2 0 12480000 0 0 50000 clk_summary after: sd0 1 1 0 12480000 0 0 50000 sdif0 1 1 0 12480000 0 0 50000 Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- Depends on mmc/next + "[PATCH 2/2] mmc: tmio: Make sure the PM domain is 'started' while probing" from Ulf Changes since v1: * reworded commit message * don't remove the en-/disable calls themselves but only the clk_* calls to the main clock drivers/mmc/host/renesas_sdhi_core.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)