diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap2/clock24xx.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index e60d1c094a04..5f201d228cc8 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
@@ -751,13 +751,16 @@ int __init omap2_clk_init(void) | |||
751 | struct prcm_config *prcm; | 751 | struct prcm_config *prcm; |
752 | struct omap_clk *c; | 752 | struct omap_clk *c; |
753 | u32 clkrate; | 753 | u32 clkrate; |
754 | u16 cpu_clkflg; | ||
754 | 755 | ||
755 | if (cpu_is_omap242x()) { | 756 | if (cpu_is_omap242x()) { |
756 | prcm_clksrc_ctrl = OMAP2420_PRCM_CLKSRC_CTRL; | 757 | prcm_clksrc_ctrl = OMAP2420_PRCM_CLKSRC_CTRL; |
757 | cpu_mask = RATE_IN_242X; | 758 | cpu_mask = RATE_IN_242X; |
759 | cpu_clkflg = CK_242X; | ||
758 | } else if (cpu_is_omap2430()) { | 760 | } else if (cpu_is_omap2430()) { |
759 | prcm_clksrc_ctrl = OMAP2430_PRCM_CLKSRC_CTRL; | 761 | prcm_clksrc_ctrl = OMAP2430_PRCM_CLKSRC_CTRL; |
760 | cpu_mask = RATE_IN_243X; | 762 | cpu_mask = RATE_IN_243X; |
763 | cpu_clkflg = CK_243X; | ||
761 | } | 764 | } |
762 | 765 | ||
763 | clk_init(&omap2_clk_functions); | 766 | clk_init(&omap2_clk_functions); |
@@ -771,7 +774,7 @@ int __init omap2_clk_init(void) | |||
771 | propagate_rate(&sys_ck); | 774 | propagate_rate(&sys_ck); |
772 | 775 | ||
773 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) | 776 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) |
774 | if (c->cpu & cpu_mask) { | 777 | if (c->cpu & cpu_clkflg) { |
775 | clkdev_add(&c->lk); | 778 | clkdev_add(&c->lk); |
776 | clk_register(c->lk.clk); | 779 | clk_register(c->lk.clk); |
777 | omap2_init_clk_clkdm(c->lk.clk); | 780 | omap2_init_clk_clkdm(c->lk.clk); |