diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-25 17:10:38 -0500 |
commit | 9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch) | |
tree | 7ad6e825427a15c5ec0fc15540abc0429d7f4bce /arch/arm/mach-mx1/clock.c | |
parent | 2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff) | |
parent | eed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff) |
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'arch/arm/mach-mx1/clock.c')
-rw-r--r-- | arch/arm/mach-mx1/clock.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-mx1/clock.c b/arch/arm/mach-mx1/clock.c index d1b588519ad2..6cf2d4a7511d 100644 --- a/arch/arm/mach-mx1/clock.c +++ b/arch/arm/mach-mx1/clock.c | |||
@@ -570,7 +570,6 @@ static struct clk_lookup lookups[] __initdata = { | |||
570 | int __init mx1_clocks_init(unsigned long fref) | 570 | int __init mx1_clocks_init(unsigned long fref) |
571 | { | 571 | { |
572 | unsigned int reg; | 572 | unsigned int reg; |
573 | int i; | ||
574 | 573 | ||
575 | /* disable clocks we are able to */ | 574 | /* disable clocks we are able to */ |
576 | __raw_writel(0, SCM_GCCR); | 575 | __raw_writel(0, SCM_GCCR); |
@@ -592,8 +591,7 @@ int __init mx1_clocks_init(unsigned long fref) | |||
592 | reg = (reg & CCM_CSCR_CLKO_MASK) >> CCM_CSCR_CLKO_OFFSET; | 591 | reg = (reg & CCM_CSCR_CLKO_MASK) >> CCM_CSCR_CLKO_OFFSET; |
593 | clko_clk.parent = (struct clk *)clko_clocks[reg]; | 592 | clko_clk.parent = (struct clk *)clko_clocks[reg]; |
594 | 593 | ||
595 | for (i = 0; i < ARRAY_SIZE(lookups); i++) | 594 | clkdev_add_table(lookups, ARRAY_SIZE(lookups)); |
596 | clkdev_add(&lookups[i]); | ||
597 | 595 | ||
598 | clk_enable(&hclk); | 596 | clk_enable(&hclk); |
599 | clk_enable(&fclk); | 597 | clk_enable(&fclk); |