diff options
Diffstat (limited to 'drivers/clk/pxa')
| -rw-r--r-- | drivers/clk/pxa/clk-pxa.h | 2 | ||||
| -rw-r--r-- | drivers/clk/pxa/clk-pxa3xx.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/clk/pxa/clk-pxa.h b/drivers/clk/pxa/clk-pxa.h index 323965430111..b04c5b9c0ea8 100644 --- a/drivers/clk/pxa/clk-pxa.h +++ b/drivers/clk/pxa/clk-pxa.h @@ -14,7 +14,7 @@ #define _CLK_PXA_ #define PARENTS(name) \ - static const char *name ## _parents[] __initconst + static const char *name ## _parents[] __initdata #define MUX_RO_RATE_RO_OPS(name, clk_name) \ static struct clk_hw name ## _mux_hw; \ static struct clk_hw name ## _rate_hw; \ diff --git a/drivers/clk/pxa/clk-pxa3xx.c b/drivers/clk/pxa/clk-pxa3xx.c index 39f891bba09a..4b93a1efb36d 100644 --- a/drivers/clk/pxa/clk-pxa3xx.c +++ b/drivers/clk/pxa/clk-pxa3xx.c @@ -336,6 +336,9 @@ static void __init pxa3xx_base_clocks_init(void) clk_register_clk_pxa3xx_smemc(); clk_register_gate(NULL, "CLK_POUT", "osc_13mhz", 0, (void __iomem *)&OSCC, 11, 0, NULL); + clkdev_pxa_register(CLK_OSTIMER, "OSTIMER0", NULL, + clk_register_fixed_factor(NULL, "os-timer0", + "osc_13mhz", 0, 1, 4)); } int __init pxa3xx_clocks_init(void) |