* [PATCH 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare [not found] <1337987696-31728-1-git-send-email-festevam@gmail.com> @ 2012-05-25 23:14 ` Fabio Estevam 2012-05-26 11:29 ` Sascha Hauer 2012-05-25 23:14 ` [PATCH 04/15] dma: imx-sdma: " Fabio Estevam 1 sibling, 1 reply; 8+ messages in thread From: Fabio Estevam @ 2012-05-25 23:14 UTC (permalink / raw) To: kernel; +Cc: shawn.guo, Fabio Estevam, Herbert Xu, linux-kernel From: Fabio Estevam <fabio.estevam@freescale.com> Prepare the clock before enabling it. Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: <linux-kernel@vger.kernel.org> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- drivers/char/hw_random/mxc-rnga.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/char/hw_random/mxc-rnga.c b/drivers/char/hw_random/mxc-rnga.c index 187c6be..6f20f56 100644 --- a/drivers/char/hw_random/mxc-rnga.c +++ b/drivers/char/hw_random/mxc-rnga.c @@ -154,7 +154,7 @@ static int __init mxc_rnga_probe(struct platform_device *pdev) goto out; } - clk_enable(clk); + clk_prepare_enable(clk); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -196,7 +196,7 @@ err_ioremap: release_mem_region(res->start, resource_size(res)); err_region: - clk_disable(clk); + clk_disable_unprepare(clk); clk_put(clk); out: -- 1.7.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare 2012-05-25 23:14 ` [PATCH 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare Fabio Estevam @ 2012-05-26 11:29 ` Sascha Hauer 0 siblings, 0 replies; 8+ messages in thread From: Sascha Hauer @ 2012-05-26 11:29 UTC (permalink / raw) To: Fabio Estevam; +Cc: kernel, shawn.guo, Fabio Estevam, Herbert Xu, linux-kernel On Fri, May 25, 2012 at 08:14:44PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > Prepare the clock before enabling it. > > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: <linux-kernel@vger.kernel.org> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > drivers/char/hw_random/mxc-rnga.c | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/char/hw_random/mxc-rnga.c b/drivers/char/hw_random/mxc-rnga.c > index 187c6be..6f20f56 100644 > --- a/drivers/char/hw_random/mxc-rnga.c > +++ b/drivers/char/hw_random/mxc-rnga.c > @@ -154,7 +154,7 @@ static int __init mxc_rnga_probe(struct platform_device *pdev) > goto out; > } > > - clk_enable(clk); > + clk_prepare_enable(clk); > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (!res) { > @@ -196,7 +196,7 @@ err_ioremap: > release_mem_region(res->start, resource_size(res)); > > err_region: > - clk_disable(clk); > + clk_disable_unprepare(clk); You forgot the clk_disable_unprepare in the remove path. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 04/15] dma: imx-sdma: Use clk_prepare_enable/clk_disable_unprepare [not found] <1337987696-31728-1-git-send-email-festevam@gmail.com> 2012-05-25 23:14 ` [PATCH 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare Fabio Estevam @ 2012-05-25 23:14 ` Fabio Estevam 2012-05-26 11:30 ` Sascha Hauer 2012-05-26 16:03 ` [PATCH v2 03/15] hw_random: mxc-rnga: " Fabio Estevam 1 sibling, 2 replies; 8+ messages in thread From: Fabio Estevam @ 2012-05-25 23:14 UTC (permalink / raw) To: kernel; +Cc: shawn.guo, Fabio Estevam, Vinod Koul, linux-kernel From: Fabio Estevam <fabio.estevam@freescale.com> Prepare the clock before enabling it. Cc: Vinod Koul <vinod.koul@intel.com> Cc: <linux-kernel@vger.kernel.org> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- drivers/dma/imx-sdma.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index fb4f499..b6174e6 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -868,8 +868,8 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan) sdmac->peripheral_type = data->peripheral_type; sdmac->event_id0 = data->dma_request; - clk_enable(sdmac->sdma->clk_ipg); - clk_enable(sdmac->sdma->clk_ahb); + clk_prepare_enable(sdmac->sdma->clk_ipg); + clk_prepare_enable(sdmac->sdma->clk_ahb); ret = sdma_request_channel(sdmac); if (ret) @@ -906,8 +906,8 @@ static void sdma_free_chan_resources(struct dma_chan *chan) dma_free_coherent(NULL, PAGE_SIZE, sdmac->bd, sdmac->bd_phys); - clk_disable(sdma->clk_ipg); - clk_disable(sdma->clk_ahb); + clk_disable_unprepare(sdma->clk_ipg); + clk_disable_unprepare(sdma->clk_ahb); } static struct dma_async_tx_descriptor *sdma_prep_slave_sg( @@ -1180,14 +1180,14 @@ static void sdma_load_firmware(const struct firmware *fw, void *context) addr = (void *)header + header->script_addrs_start; ram_code = (void *)header + header->ram_code_start; - clk_enable(sdma->clk_ipg); - clk_enable(sdma->clk_ahb); + clk_prepare_enable(sdma->clk_ipg); + clk_prepare_enable(sdma->clk_ahb); /* download the RAM image for SDMA */ sdma_load_script(sdma, ram_code, header->ram_code_size, addr->ram_code_start_addr); - clk_disable(sdma->clk_ipg); - clk_disable(sdma->clk_ahb); + clk_disable_unprepare(sdma->clk_ipg); + clk_disable_unprepare(sdma->clk_ahb); sdma_add_scripts(sdma, addr); @@ -1229,8 +1229,8 @@ static int __init sdma_init(struct sdma_engine *sdma) return -ENODEV; } - clk_enable(sdma->clk_ipg); - clk_enable(sdma->clk_ahb); + clk_prepare_enable(sdma->clk_ipg); + clk_prepare_enable(sdma->clk_ahb); /* Be sure SDMA has not started yet */ writel_relaxed(0, sdma->regs + SDMA_H_C0PTR); @@ -1283,14 +1283,14 @@ static int __init sdma_init(struct sdma_engine *sdma) /* Initializes channel's priorities */ sdma_set_channel_priority(&sdma->channel[0], 7); - clk_disable(sdma->clk_ipg); - clk_disable(sdma->clk_ahb); + clk_disable_unprepare(sdma->clk_ipg); + clk_disable_unprepare(sdma->clk_ahb); return 0; err_dma_alloc: - clk_disable(sdma->clk_ipg); - clk_disable(sdma->clk_ahb); + clk_disable_unprepare(sdma->clk_ipg); + clk_disable_unprepare(sdma->clk_ahb); dev_err(sdma->dev, "initialisation failed with %d\n", ret); return ret; } -- 1.7.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 04/15] dma: imx-sdma: Use clk_prepare_enable/clk_disable_unprepare 2012-05-25 23:14 ` [PATCH 04/15] dma: imx-sdma: " Fabio Estevam @ 2012-05-26 11:30 ` Sascha Hauer 2012-05-26 16:03 ` [PATCH v2 03/15] hw_random: mxc-rnga: " Fabio Estevam 1 sibling, 0 replies; 8+ messages in thread From: Sascha Hauer @ 2012-05-26 11:30 UTC (permalink / raw) To: Fabio Estevam; +Cc: kernel, shawn.guo, Fabio Estevam, Vinod Koul, linux-kernel On Fri, May 25, 2012 at 08:14:45PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > Prepare the clock before enabling it. > > Cc: Vinod Koul <vinod.koul@intel.com> > Cc: <linux-kernel@vger.kernel.org> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > --- > drivers/dma/imx-sdma.c | 28 ++++++++++++++-------------- > 1 files changed, 14 insertions(+), 14 deletions(-) > > diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c > index fb4f499..b6174e6 100644 > --- a/drivers/dma/imx-sdma.c > +++ b/drivers/dma/imx-sdma.c > @@ -868,8 +868,8 @@ static int sdma_alloc_chan_resources(struct dma_chan *chan) > sdmac->peripheral_type = data->peripheral_type; > sdmac->event_id0 = data->dma_request; > > - clk_enable(sdmac->sdma->clk_ipg); > - clk_enable(sdmac->sdma->clk_ahb); > + clk_prepare_enable(sdmac->sdma->clk_ipg); > + clk_prepare_enable(sdmac->sdma->clk_ahb); No, the clock already is prepared, see the probe function. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare 2012-05-25 23:14 ` [PATCH 04/15] dma: imx-sdma: " Fabio Estevam 2012-05-26 11:30 ` Sascha Hauer @ 2012-05-26 16:03 ` Fabio Estevam 2012-05-29 9:17 ` Sascha Hauer 1 sibling, 1 reply; 8+ messages in thread From: Fabio Estevam @ 2012-05-26 16:03 UTC (permalink / raw) To: kernel; +Cc: shawn.guo, Fabio Estevam, Herbert Xu, linux-kernel From: Fabio Estevam <fabio.estevam@freescale.com> Prepare the clock before enabling it. Cc: Herbert Xu <herbert@gondor.apana.org.au> Cc: <linux-kernel@vger.kernel.org> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> --- Changes since v1: - Add missing clk_disable_unprepare(clk) in the remove path drivers/char/hw_random/mxc-rnga.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/char/hw_random/mxc-rnga.c b/drivers/char/hw_random/mxc-rnga.c index 187c6be..430582c 100644 --- a/drivers/char/hw_random/mxc-rnga.c +++ b/drivers/char/hw_random/mxc-rnga.c @@ -154,7 +154,7 @@ static int __init mxc_rnga_probe(struct platform_device *pdev) goto out; } - clk_enable(clk); + clk_prepare_enable(clk); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res) { @@ -196,7 +196,7 @@ err_ioremap: release_mem_region(res->start, resource_size(res)); err_region: - clk_disable(clk); + clk_disable_unprepare(clk); clk_put(clk); out: @@ -215,7 +215,7 @@ static int __exit mxc_rnga_remove(struct platform_device *pdev) release_mem_region(res->start, resource_size(res)); - clk_disable(clk); + clk_disable_unprepare(clk); clk_put(clk); return 0; -- 1.7.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare 2012-05-26 16:03 ` [PATCH v2 03/15] hw_random: mxc-rnga: " Fabio Estevam @ 2012-05-29 9:17 ` Sascha Hauer 2012-06-06 3:41 ` Fabio Estevam 0 siblings, 1 reply; 8+ messages in thread From: Sascha Hauer @ 2012-05-29 9:17 UTC (permalink / raw) To: Fabio Estevam; +Cc: kernel, shawn.guo, Fabio Estevam, Herbert Xu, linux-kernel On Sat, May 26, 2012 at 01:03:52PM -0300, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@freescale.com> > > Prepare the clock before enabling it. > > Cc: Herbert Xu <herbert@gondor.apana.org.au> > Cc: <linux-kernel@vger.kernel.org> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > Changes since v1: > - Add missing clk_disable_unprepare(clk) in the remove path > > drivers/char/hw_random/mxc-rnga.c | 6 +++--- > 1 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/char/hw_random/mxc-rnga.c b/drivers/char/hw_random/mxc-rnga.c > index 187c6be..430582c 100644 > --- a/drivers/char/hw_random/mxc-rnga.c > +++ b/drivers/char/hw_random/mxc-rnga.c > @@ -154,7 +154,7 @@ static int __init mxc_rnga_probe(struct platform_device *pdev) > goto out; > } > > - clk_enable(clk); > + clk_prepare_enable(clk); > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > if (!res) { > @@ -196,7 +196,7 @@ err_ioremap: > release_mem_region(res->start, resource_size(res)); > > err_region: > - clk_disable(clk); > + clk_disable_unprepare(clk); > clk_put(clk); > > out: > @@ -215,7 +215,7 @@ static int __exit mxc_rnga_remove(struct platform_device *pdev) > > release_mem_region(res->start, resource_size(res)); > > - clk_disable(clk); > + clk_disable_unprepare(clk); > clk_put(clk); > > return 0; > -- > 1.7.1 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare 2012-05-29 9:17 ` Sascha Hauer @ 2012-06-06 3:41 ` Fabio Estevam 2012-06-06 5:24 ` Herbert Xu 0 siblings, 1 reply; 8+ messages in thread From: Fabio Estevam @ 2012-06-06 3:41 UTC (permalink / raw) To: Sascha Hauer; +Cc: kernel, shawn.guo, Fabio Estevam, Herbert Xu, linux-kernel Herbert, On Tue, May 29, 2012 at 6:17 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > On Sat, May 26, 2012 at 01:03:52PM -0300, Fabio Estevam wrote: >> From: Fabio Estevam <fabio.estevam@freescale.com> >> >> Prepare the clock before enabling it. >> >> Cc: Herbert Xu <herbert@gondor.apana.org.au> >> Cc: <linux-kernel@vger.kernel.org> >> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > > Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Can this be applied? ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare 2012-06-06 3:41 ` Fabio Estevam @ 2012-06-06 5:24 ` Herbert Xu 0 siblings, 0 replies; 8+ messages in thread From: Herbert Xu @ 2012-06-06 5:24 UTC (permalink / raw) To: Fabio Estevam Cc: Sascha Hauer, kernel, shawn.guo, Fabio Estevam, linux-kernel On Wed, Jun 06, 2012 at 12:41:17AM -0300, Fabio Estevam wrote: > Herbert, > > On Tue, May 29, 2012 at 6:17 AM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > On Sat, May 26, 2012 at 01:03:52PM -0300, Fabio Estevam wrote: > >> From: Fabio Estevam <fabio.estevam@freescale.com> > >> > >> Prepare the clock before enabling it. > >> > >> Cc: Herbert Xu <herbert@gondor.apana.org.au> > >> Cc: <linux-kernel@vger.kernel.org> > >> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com> > > > > Acked-by: Sascha Hauer <s.hauer@pengutronix.de> > > Can this be applied? Your patch is in my queue. I'm at LinuxCon Japan right now, so I'll be applying them later this week. Cheers, -- Email: Herbert Xu <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2012-06-06 5:24 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1337987696-31728-1-git-send-email-festevam@gmail.com>
2012-05-25 23:14 ` [PATCH 03/15] hw_random: mxc-rnga: Use clk_prepare_enable/clk_disable_unprepare Fabio Estevam
2012-05-26 11:29 ` Sascha Hauer
2012-05-25 23:14 ` [PATCH 04/15] dma: imx-sdma: " Fabio Estevam
2012-05-26 11:30 ` Sascha Hauer
2012-05-26 16:03 ` [PATCH v2 03/15] hw_random: mxc-rnga: " Fabio Estevam
2012-05-29 9:17 ` Sascha Hauer
2012-06-06 3:41 ` Fabio Estevam
2012-06-06 5:24 ` Herbert Xu
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox