| Message ID | 1409649835-13778-1-git-send-email-robert.jarzmik@free.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2 September 2014 11:23, Robert Jarzmik <robert.jarzmik@free.fr> wrote: > Add the clock prepare and unprepare call to the driver set_ios calls > phase. This will remove a warning once the PXA architecture is migrated > to the clock infrastructure. > > Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Thanks! Applied for next. Kind regards Uffe > --- > drivers/mmc/host/pxamci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c > index 32fe113..96406e8 100644 > --- a/drivers/mmc/host/pxamci.c > +++ b/drivers/mmc/host/pxamci.c > @@ -474,7 +474,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > unsigned int clk = rate / ios->clock; > > if (host->clkrt == CLKRT_OFF) > - clk_enable(host->clk); > + clk_prepare_enable(host->clk); > > if (ios->clock == 26000000) { > /* to support 26MHz */ > @@ -501,7 +501,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) > pxamci_stop_clock(host); > if (host->clkrt != CLKRT_OFF) { > host->clkrt = CLKRT_OFF; > - clk_disable(host->clk); > + clk_disable_unprepare(host->clk); > } > } > > -- > 1.9.1 > -- 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/pxamci.c b/drivers/mmc/host/pxamci.c index 32fe113..96406e8 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c @@ -474,7 +474,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) unsigned int clk = rate / ios->clock; if (host->clkrt == CLKRT_OFF) - clk_enable(host->clk); + clk_prepare_enable(host->clk); if (ios->clock == 26000000) { /* to support 26MHz */ @@ -501,7 +501,7 @@ static void pxamci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) pxamci_stop_clock(host); if (host->clkrt != CLKRT_OFF) { host->clkrt = CLKRT_OFF; - clk_disable(host->clk); + clk_disable_unprepare(host->clk); } }
Add the clock prepare and unprepare call to the driver set_ios calls phase. This will remove a warning once the PXA architecture is migrated to the clock infrastructure. Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> --- drivers/mmc/host/pxamci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)