aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx2/clock_imx21.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:10:38 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-25 22:10:38 +0000
commit9f33be2c3a80bdc2cc08342dd77fac87652e0548 (patch)
tree7ad6e825427a15c5ec0fc15540abc0429d7f4bce /arch/arm/mach-mx2/clock_imx21.c
parent2741ecb4ce5c2d430b5c44b0a169038338c21df5 (diff)
parenteed18b5fa4d297c681b00144e8c6942dd35d39a7 (diff)
downloadkernel_samsung_smdk4412-9f33be2c3a80bdc2cc08342dd77fac87652e0548.zip
kernel_samsung_smdk4412-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.gz
kernel_samsung_smdk4412-9f33be2c3a80bdc2cc08342dd77fac87652e0548.tar.bz2
Merge branches 'clks' and 'pnx' into devel
Diffstat (limited to 'arch/arm/mach-mx2/clock_imx21.c')
-rw-r--r--arch/arm/mach-mx2/clock_imx21.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/mach-mx2/clock_imx21.c b/arch/arm/mach-mx2/clock_imx21.c
index 91901b5..e82b489 100644
--- a/arch/arm/mach-mx2/clock_imx21.c
+++ b/arch/arm/mach-mx2/clock_imx21.c
@@ -968,7 +968,6 @@ static struct clk_lookup lookups[] = {
*/
int __init mx21_clocks_init(unsigned long lref, unsigned long href)
{
- int i;
u32 cscr;
external_low_reference = lref;
@@ -986,8 +985,7 @@ int __init mx21_clocks_init(unsigned long lref, unsigned long href)
else
spll_clk.parent = &fpm_clk;
- for (i = 0; i < ARRAY_SIZE(lookups); i++)
- clkdev_add(&lookups[i]);
+ clkdev_add_table(lookups, ARRAY_SIZE(lookups));
/* Turn off all clock gates */
__raw_writel(0, CCM_PCCR0);