mfd: tc6393xb: prepare/unprepare clocks
PATCH 1/1 mfd: tc6393xb: prepare/unprepare clocks
Change clk_enable/disable() calls to clk_prepare_enable() and clk_disable_unrepapre().
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>
--- drivers/mfd/tc6393xb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/tc6393xb.c +5 -5
@@ -665,7 +665,7 @@ static int tc6393xb_probe(struct platform_device *dev) goto err_ioremap; } - ret =clk_enable (tc6393xb->clk); + ret =clk_prepare_enable (tc6393xb->clk);if (ret) goto err_clk_enable;
@@ -728,7 +728,7 @@ err_gpio_add: temp =gpiochip_remove (&tc6393xb->gpio); tcpd->disable (dev); err_enable: -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk); err_clk_enable:iounmap (tc6393xb->scr); err_ioremap:
@@ -764,7 +764,7 @@ static int tc6393xb_remove(struct platform_device *dev) } ret = tcpd->disable (dev); -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk);iounmap (tc6393xb->scr);release_resource (&tc6393xb->rscr);clk_put (tc6393xb->clk);
@@ -792,7 +792,7 @@ static int tc6393xb_suspend(struct platform_device *dev, pm_message_t state)ioread8 (tc6393xb->scr +SCR_GPI_BCR (i)); } ret = tcpd->suspend (dev); -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk);return ret; }
@@ -804,7 +804,7 @@ static int tc6393xb_resume(struct platform_device *dev)int ret;int i; -clk_enable (tc6393xb->clk); +clk_prepare_enable (tc6393xb->clk); ret = tcpd->resume (dev);if (ret)
Signature · 1 line
2.1.1
Lee Jones
AppliedQuoted 7 lines · Dmitry Eremin-Solenikov
Change clk_enable/disable() calls to
clk_prepare_enable()andclk_disable_unrepapre().Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- drivers/mfd/tc6393xb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Applied, thanks.
Quoted 49 lines
drivers/mfd/tc6393xb.c +5
-5@@ -665,7 +665,7 @@ static int tc6393xb_probe(struct platform_device *dev) goto err_ioremap; } - ret =clk_enable (tc6393xb->clk); + ret =clk_prepare_enable (tc6393xb->clk);if (ret) goto err_clk_enable;@@ -728,7 +728,7 @@ err_gpio_add: temp =gpiochip_remove (&tc6393xb->gpio); tcpd->disable (dev); err_enable: -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk); err_clk_enable:iounmap (tc6393xb->scr); err_ioremap:@@ -764,7 +764,7 @@ static int tc6393xb_remove(struct platform_device *dev) } ret = tcpd->disable (dev); -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk);iounmap (tc6393xb->scr);release_resource (&tc6393xb->rscr);clk_put (tc6393xb->clk);@@ -792,7 +792,7 @@ static int tc6393xb_suspend(struct platform_device *dev, pm_message_t state)ioread8 (tc6393xb->scr +SCR_GPI_BCR (i)); } ret = tcpd->suspend (dev); -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk);return ret; }@@ -804,7 +804,7 @@ static int tc6393xb_resume(struct platform_device *dev)int ret;int i; -clk_enable (tc6393xb->clk); +clk_prepare_enable (tc6393xb->clk); ret = tcpd->resume (dev);if (ret)
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Quoted 11 lines · Lee Jones
Quoted 7 lines · Dmitry Eremin-Solenikov
Change clk_enable/disable() calls to
clk_prepare_enable()andclk_disable_unrepapre().Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- drivers/mfd/tc6393xb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)Applied, thanks.
OOI, what kernel version was this patch based on?
Quoted 50 lines
Quoted 49 lines
drivers/mfd/tc6393xb.c +5
-5@@ -665,7 +665,7 @@ static int tc6393xb_probe(struct platform_device *dev) goto err_ioremap; } - ret =clk_enable (tc6393xb->clk); + ret =clk_prepare_enable (tc6393xb->clk);if (ret) goto err_clk_enable;@@ -728,7 +728,7 @@ err_gpio_add: temp =gpiochip_remove (&tc6393xb->gpio); tcpd->disable (dev); err_enable: -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk); err_clk_enable:iounmap (tc6393xb->scr); err_ioremap:@@ -764,7 +764,7 @@ static int tc6393xb_remove(struct platform_device *dev) } ret = tcpd->disable (dev); -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk);iounmap (tc6393xb->scr);release_resource (&tc6393xb->rscr);clk_put (tc6393xb->clk);@@ -792,7 +792,7 @@ static int tc6393xb_suspend(struct platform_device *dev, pm_message_t state)ioread8 (tc6393xb->scr +SCR_GPI_BCR (i)); } ret = tcpd->suspend (dev); -clk_disable (tc6393xb->clk); +clk_disable_unprepare (tc6393xb->clk);return ret; }@@ -804,7 +804,7 @@ static int tc6393xb_resume(struct platform_device *dev)int ret;int i; -clk_enable (tc6393xb->clk); +clk_prepare_enable (tc6393xb->clk); ret = tcpd->resume (dev);if (ret)
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
2014-11-10 16:53 GMT+03:00 Lee Jones <[email protected]>:
Quoted 7 lines · Lee Jones
Quoted 6 lines · Dmitry Eremin-Solenikov
Quoted 4 lines
Change clk_enable/disable() calls to
clk_prepare_enable()andclk_disable_unrepapre().
Quoted 8 lines
Quoted 6 lines
Quoted 4 lines
Signed-off-by Dmitry Eremin-Solenikov <[email protected]>--- drivers/mfd/tc6393xb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)Applied, thanks.
OOI, what kernel version was this patch based on?
v3.18-rc something. It is not required for previous kernel versions, since machines with
these chips (PXA-based) do not use COMMON_CLK (and thus do not trigger a warning).
Robert Jarzmik started converting pxa to common clocks framework and thus I spotted
the warning.
Signature · 2 lines
With best wishes Dmitry