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-mx3 | |
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-mx3')
-rw-r--r-- | arch/arm/mach-mx3/clock-imx35.c | 4 | ||||
-rw-r--r-- | arch/arm/mach-mx3/clock.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/arch/arm/mach-mx3/clock-imx35.c b/arch/arm/mach-mx3/clock-imx35.c index 7584b4c6c55..f3f41fa4f21 100644 --- a/arch/arm/mach-mx3/clock-imx35.c +++ b/arch/arm/mach-mx3/clock-imx35.c | |||
@@ -485,15 +485,13 @@ static struct clk_lookup lookups[] = { | |||
485 | 485 | ||
486 | int __init mx35_clocks_init() | 486 | int __init mx35_clocks_init() |
487 | { | 487 | { |
488 | int i; | ||
489 | unsigned int ll = 0; | 488 | unsigned int ll = 0; |
490 | 489 | ||
491 | #if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC) | 490 | #if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC) |
492 | ll = (3 << 16); | 491 | ll = (3 << 16); |
493 | #endif | 492 | #endif |
494 | 493 | ||
495 | for (i = 0; i < ARRAY_SIZE(lookups); i++) | 494 | clkdev_add_table(lookups, ARRAY_SIZE(lookups)); |
496 | clkdev_add(&lookups[i]); | ||
497 | 495 | ||
498 | /* Turn off all clocks except the ones we need to survive, namely: | 496 | /* Turn off all clocks except the ones we need to survive, namely: |
499 | * EMI, GPIO1/2/3, GPT, IOMUX, MAX and eventually uart | 497 | * EMI, GPIO1/2/3, GPT, IOMUX, MAX and eventually uart |
diff --git a/arch/arm/mach-mx3/clock.c b/arch/arm/mach-mx3/clock.c index 27a318af0d2..b5c39a016db 100644 --- a/arch/arm/mach-mx3/clock.c +++ b/arch/arm/mach-mx3/clock.c | |||
@@ -578,12 +578,10 @@ static struct clk_lookup lookups[] = { | |||
578 | int __init mx31_clocks_init(unsigned long fref) | 578 | int __init mx31_clocks_init(unsigned long fref) |
579 | { | 579 | { |
580 | u32 reg; | 580 | u32 reg; |
581 | int i; | ||
582 | 581 | ||
583 | ckih_rate = fref; | 582 | ckih_rate = fref; |
584 | 583 | ||
585 | for (i = 0; i < ARRAY_SIZE(lookups); i++) | 584 | clkdev_add_table(lookups, ARRAY_SIZE(lookups)); |
586 | clkdev_add(&lookups[i]); | ||
587 | 585 | ||
588 | /* change the csi_clk parent if necessary */ | 586 | /* change the csi_clk parent if necessary */ |
589 | reg = __raw_readl(MXC_CCM_CCMR); | 587 | reg = __raw_readl(MXC_CCM_CCMR); |