diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-12 07:28:00 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-02-12 12:32:36 -0500 |
commit | 0a0300dc8c4b3f3ce5c9ef5a0a4be5442590398f (patch) | |
tree | e9a0a9dc5f195447f44a077f76c8d61e2c955d17 /arch/arm/mach-mx1/clock.c | |
parent | 92dcffb916d309aa01778bf8963a6932e4014d07 (diff) |
ARM: Consolidate clks_register() and similar
Most machine classes want some way to register a block of clk_lookup
structures, and most do it by implementing a clks_register() type
function which walks an array, or by open-coding a loop.
Consolidate all this into clkdev_add_table().
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Kevin Hilman <khilman@deeprootsystems.com>
Acked-by: Eric Miao <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
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); |