Message ID | 1474312335-20997-2-git-send-email-robert.jarzmik@free.fr (mailing list archive) |
---|---|
State | Not Applicable, archived |
Delegated to: | Stephen Boyd |
Headers | show |
On 09/19, Robert Jarzmik wrote: > From: Russell King - ARM Linux <linux@armlinux.org.uk> > > The OSTIMER0 clock ticks at the main oscillator rate, not the 32kHz > oscillator rate. Ensure that it is parented to the main oscillator. > > Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> > Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> > Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> > --- Acked-by: Stephen Boyd <sboyd@codeaurora.org>
diff --git a/drivers/clk/pxa/clk-pxa25x.c b/drivers/clk/pxa/clk-pxa25x.c index a98b98e2a9e4..56b0a6027e38 100644 --- a/drivers/clk/pxa/clk-pxa25x.c +++ b/drivers/clk/pxa/clk-pxa25x.c @@ -230,7 +230,7 @@ static struct dummy_clk dummy_clks[] __initdata = { DUMMY_CLK("GPIO11_CLK", NULL, "osc_3_6864mhz"), DUMMY_CLK("GPIO12_CLK", NULL, "osc_32_768khz"), DUMMY_CLK(NULL, "sa1100-rtc", "osc_32_768khz"), - DUMMY_CLK("OSTIMER0", NULL, "osc_32_768khz"), + DUMMY_CLK("OSTIMER0", NULL, "osc_3_6864mhz"), DUMMY_CLK("UARTCLK", "pxa2xx-ir", "STUART"), };