| Message ID | 20130924130924.61d4ecedf3d4fca5952d55fc@ops.dti.ne.jp (mailing list archive) |
|---|---|
| State | Superseded |
| Commit | c93031270dfb9b60dba1fc63073406e31acfc7b4 |
| Headers | show |
[ CCed Daniel Lezcano and Thomas Gleixner, the clocksource maintainers ] On Tue, Sep 24, 2013 at 01:09:24PM +0900, takasi-y@ops.dti.ne.jp wrote: > From: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> > > Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can > migrate to the common clock framework. > > Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> > --- > drivers/clocksource/em_sti.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c > index 3a5909c..9d17083 100644 > --- a/drivers/clocksource/em_sti.c > +++ b/drivers/clocksource/em_sti.c > @@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_priv *p) > int ret; > > /* enable clock */ > - ret = clk_enable(p->clk); > + ret = clk_prepare_enable(p->clk); > if (ret) { > dev_err(&p->pdev->dev, "cannot enable clock\n"); > return ret; > @@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti_priv *p) > em_sti_write(p, STI_INTENCLR, 3); > > /* stop clock */ > - clk_disable(p->clk); > + clk_disable_unprepare(p->clk); > } > > static cycle_t em_sti_count(struct em_sti_priv *p) > -- > 1.8.1.5 > -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/24/2013 06:42 AM, Simon Horman wrote: > [ CCed Daniel Lezcano and Thomas Gleixner, the clocksource maintainers ] > > On Tue, Sep 24, 2013 at 01:09:24PM +0900, takasi-y@ops.dti.ne.jp wrote: >> From: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> >> >> Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can >> migrate to the common clock framework. >> >> Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> I am not a clk framework expert but at the first glance sounds correct. Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org> >> --- >> drivers/clocksource/em_sti.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c >> index 3a5909c..9d17083 100644 >> --- a/drivers/clocksource/em_sti.c >> +++ b/drivers/clocksource/em_sti.c >> @@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_priv *p) >> int ret; >> >> /* enable clock */ >> - ret = clk_enable(p->clk); >> + ret = clk_prepare_enable(p->clk); >> if (ret) { >> dev_err(&p->pdev->dev, "cannot enable clock\n"); >> return ret; >> @@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti_priv *p) >> em_sti_write(p, STI_INTENCLR, 3); >> >> /* stop clock */ >> - clk_disable(p->clk); >> + clk_disable_unprepare(p->clk); >> } >> >> static cycle_t em_sti_count(struct em_sti_priv *p) >> -- >> 1.8.1.5 >>
Hi Yoshii-san, Thank you for the patch. On Tuesday 24 September 2013 13:09:24 takasi-y@ops.dti.ne.jp wrote: > From: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> > > Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can > migrate to the common clock framework. > > Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > drivers/clocksource/em_sti.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/clocksource/em_sti.c b/drivers/clocksource/em_sti.c > index 3a5909c..9d17083 100644 > --- a/drivers/clocksource/em_sti.c > +++ b/drivers/clocksource/em_sti.c > @@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_priv *p) > int ret; > > /* enable clock */ > - ret = clk_enable(p->clk); > + ret = clk_prepare_enable(p->clk); > if (ret) { > dev_err(&p->pdev->dev, "cannot enable clock\n"); > return ret; > @@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti_priv *p) > em_sti_write(p, STI_INTENCLR, 3); > > /* stop clock */ > - clk_disable(p->clk); > + clk_disable_unprepare(p->clk); > } > > static cycle_t em_sti_count(struct em_sti_priv *p)
On Tue, Sep 24, 2013 at 1:09 PM, <takasi-y@ops.dti.ne.jp> wrote: > From: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> > > Add calls to clk_prepare and unprepare so that EMMA Mobile EV2 can > migrate to the common clock framework. > > Signed-off-by: Shinya Kuribayashi <shinya.kuribayashi.px@renesas.com> > --- > drivers/clocksource/em_sti.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) Looking good, thanks! Acked-by: Magnus Damm <damm@opensource.se> -- To unsubscribe from this list: send the line "unsubscribe linux-sh" 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/clocksource/em_sti.c b/drivers/clocksource/em_sti.c index 3a5909c..9d17083 100644 --- a/drivers/clocksource/em_sti.c +++ b/drivers/clocksource/em_sti.c @@ -78,7 +78,7 @@ static int em_sti_enable(struct em_sti_priv *p) int ret; /* enable clock */ - ret = clk_enable(p->clk); + ret = clk_prepare_enable(p->clk); if (ret) { dev_err(&p->pdev->dev, "cannot enable clock\n"); return ret; @@ -107,7 +107,7 @@ static void em_sti_disable(struct em_sti_priv *p) em_sti_write(p, STI_INTENCLR, 3); /* stop clock */ - clk_disable(p->clk); + clk_disable_unprepare(p->clk); } static cycle_t em_sti_count(struct em_sti_priv *p)