* [PATCH] i2c-nomadik: Fixup clock handling
@ 2012-09-20 15:20 Ulf Hansson
[not found] ` <1348154447-3815-1-git-send-email-ulf.hansson-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org>
0 siblings, 1 reply; 3+ messages in thread
From: Ulf Hansson @ 2012-09-20 15:20 UTC (permalink / raw)
To: Ben Dooks, Wolfram Sang, linux-i2c-u79uwXL29TY76Z2rM5mHXA
Cc: Linus Walleij, Alessandro Rubini,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
Philippe Begnic, Ulf Hansson
From: Philippe Begnic <philippe.begnic-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org>
Make sure to clk_prepare as well as clk_enable.
Signed-off-by: Philippe Begnic <philippe.begnic-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org>
Signed-off-by: Ulf Hansson <ulf.hansson-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
drivers/i2c/busses/i2c-nomadik.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c
index 1b898b6..3eeae52 100644
--- a/drivers/i2c/busses/i2c-nomadik.c
+++ b/drivers/i2c/busses/i2c-nomadik.c
@@ -642,7 +642,11 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
pm_runtime_get_sync(&dev->adev->dev);
- clk_enable(dev->clk);
+ status = clk_prepare_enable(dev->clk);
+ if (status) {
+ dev_err(&dev->adev->dev, "can't prepare_enable clock\n");
+ goto out_clk;
+ }
status = init_hw(dev);
if (status)
@@ -669,7 +673,8 @@ static int nmk_i2c_xfer(struct i2c_adapter *i2c_adap,
}
out:
- clk_disable(dev->clk);
+ clk_disable_unprepare(dev->clk);
+out_clk:
pm_runtime_put_sync(&dev->adev->dev);
dev->busy = false;
--
1.7.10
^ permalink raw reply related [flat|nested] 3+ messages in thread[parent not found: <1348154447-3815-1-git-send-email-ulf.hansson-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org>]
* Re: [PATCH] i2c-nomadik: Fixup clock handling [not found] ` <1348154447-3815-1-git-send-email-ulf.hansson-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> @ 2012-09-20 19:17 ` Linus Walleij [not found] ` <CACRpkdZZ-gNBi7EDwhXHawmzPD9dE8wo9voX-MJ7CYQ058k-Jw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 0 siblings, 1 reply; 3+ messages in thread From: Linus Walleij @ 2012-09-20 19:17 UTC (permalink / raw) To: Ulf Hansson Cc: Ben Dooks, Wolfram Sang, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Alessandro Rubini, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Philippe Begnic, Ulf Hansson On Thu, Sep 20, 2012 at 5:20 PM, Ulf Hansson <ulf.hansson-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> wrote: > From: Philippe Begnic <philippe.begnic-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> > > Make sure to clk_prepare as well as clk_enable. Looks correct. xfer() is slowpatch so we might as well call prepare/unprepare functions there. Reviewed-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> Yours, Linus Walleij ^ permalink raw reply [flat|nested] 3+ messages in thread
[parent not found: <CACRpkdZZ-gNBi7EDwhXHawmzPD9dE8wo9voX-MJ7CYQ058k-Jw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH] i2c-nomadik: Fixup clock handling [not found] ` <CACRpkdZZ-gNBi7EDwhXHawmzPD9dE8wo9voX-MJ7CYQ058k-Jw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2012-10-01 11:42 ` Ulf Hansson 0 siblings, 0 replies; 3+ messages in thread From: Ulf Hansson @ 2012-10-01 11:42 UTC (permalink / raw) To: Wolfram Sang Cc: Ulf Hansson, Ben Dooks, linux-i2c-u79uwXL29TY76Z2rM5mHXA, Alessandro Rubini, linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r, Philippe Begnic, Linus Walleij Hi Wolfram, Juts a kind reminder on this. Do you see any problem merging this? Kind regards Ulf Hansson On 20 September 2012 21:17, Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> wrote: > On Thu, Sep 20, 2012 at 5:20 PM, Ulf Hansson <ulf.hansson-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> wrote: > >> From: Philippe Begnic <philippe.begnic-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> >> >> Make sure to clk_prepare as well as clk_enable. > > Looks correct. xfer() is slowpatch so we might as well call > prepare/unprepare functions there. > Reviewed-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> > > Yours, > Linus Walleij ^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-10-01 11:42 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-20 15:20 [PATCH] i2c-nomadik: Fixup clock handling Ulf Hansson
[not found] ` <1348154447-3815-1-git-send-email-ulf.hansson-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org>
2012-09-20 19:17 ` Linus Walleij
[not found] ` <CACRpkdZZ-gNBi7EDwhXHawmzPD9dE8wo9voX-MJ7CYQ058k-Jw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-10-01 11:42 ` Ulf Hansson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).