| Message ID | 1344199075-4111-1-git-send-email-linus.walleij@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Sun, Aug 5, 2012 at 10:37 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > The Integrator timer is using the clock framework to get the > timer frequency, but missed to prepare the clock before enabling. > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Arnd, Olof, If this patch looks OK to you I request that you apply it alone, no pull requests, too much hazzle for a single patch... Yours, Linus Walleij
On Sunday 05 August 2012, Linus Walleij wrote: > On Sun, Aug 5, 2012 at 10:37 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > > The Integrator timer is using the clock framework to get the > > timer frequency, but missed to prepare the clock before enabling. > > > > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > > Arnd, Olof, > > If this patch looks OK to you I request that you apply it alone, no pull > requests, too much hazzle for a single patch... > Applying a patch is fine, but please explain which version(s) to apply this to? Is it a regression in v3.6, or should it be backported to earlier versions too? Arnd
On Mon, Aug 6, 2012 at 4:37 PM, Arnd Bergmann <arnd@arndb.de> wrote: > On Sunday 05 August 2012, Linus Walleij wrote: >> On Sun, Aug 5, 2012 at 10:37 PM, Linus Walleij <linus.walleij@linaro.org> wrote: >> > The Integrator timer is using the clock framework to get the >> > timer frequency, but missed to prepare the clock before enabling. >> > >> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> >> >> Arnd, Olof, >> >> If this patch looks OK to you I request that you apply it alone, no pull >> requests, too much hazzle for a single patch... >> > > Applying a patch is fine, but please explain which version(s) to apply > this to? Is it a regression in v3.6, or should it be backported to > earlier versions too? Ah sorry. This is for the v3.6 rc:s. The migration to common clock makes the kernel spit warnings unless you prepare all clocks. Yours, Linus Walleij
On Monday 06 August 2012, Linus Walleij wrote: > On Mon, Aug 6, 2012 at 4:37 PM, Arnd Bergmann <arnd@arndb.de> wrote: > > On Sunday 05 August 2012, Linus Walleij wrote: > >> On Sun, Aug 5, 2012 at 10:37 PM, Linus Walleij <linus.walleij@linaro.org> wrote: > >> > The Integrator timer is using the clock framework to get the > >> > timer frequency, but missed to prepare the clock before enabling. > >> > > >> > Signed-off-by: Linus Walleij <linus.walleij@linaro.org> > >> > >> Arnd, Olof, > >> > >> If this patch looks OK to you I request that you apply it alone, no pull > >> requests, too much hazzle for a single patch... > >> > > > > Applying a patch is fine, but please explain which version(s) to apply > > this to? Is it a regression in v3.6, or should it be backported to > > earlier versions too? > > Ah sorry. This is for the v3.6 rc:s. > > The migration to common clock makes the kernel spit warnings > unless you prepare all clocks. > Ok, I've applied it to the fixes branch now. Arnd
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 7b1055c..3b22675 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -456,7 +456,7 @@ static void __init ap_init_timer(void) clk = clk_get_sys("ap_timer", NULL); BUG_ON(IS_ERR(clk)); - clk_enable(clk); + clk_prepare_enable(clk); rate = clk_get_rate(clk); writel(0, TIMER0_VA_BASE + TIMER_CTRL);
The Integrator timer is using the clock framework to get the timer frequency, but missed to prepare the clock before enabling. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> --- arch/arm/mach-integrator/integrator_ap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)