From 99cfe899accbcc9ad3b651185550378fe627b13e Mon Sep 17 00:00:00 2001 From: Mian Yousaf Kaukab Date: Mon, 26 Sep 2011 12:24:41 +0200 Subject: ux500: clocks: add clocks with clkdev_add_table() Remove the previous custom function used to add clocks. Change-Id: Ib8ca60eba80b08b3ca5f41f6774c71aaeb19e915 Signed-off-by: Mian Yousaf Kaukab Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/32144 Reviewed-by: Jonas ABERG Tested-by: Jonas ABERG --- arch/arm/mach-ux500/clock-db5500.c | 10 +++++----- arch/arm/mach-ux500/clock-db8500.c | 4 ++-- arch/arm/mach-ux500/clock.c | 7 ------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/arch/arm/mach-ux500/clock-db5500.c b/arch/arm/mach-ux500/clock-db5500.c index a48344ae889..9856f8ce1fe 100644 --- a/arch/arm/mach-ux500/clock-db5500.c +++ b/arch/arm/mach-ux500/clock-db5500.c @@ -806,13 +806,13 @@ int __init db5500_clk_init(void) if (cpu_is_u5500v1()) p1_sdi0_kclk.parent = &sdmmcclk; - clks_register(u8500_common_clock_sources, + clkdev_add_table(u8500_common_clock_sources, ARRAY_SIZE(u8500_common_clock_sources)); - clks_register(db5500_prcmu_clocks, ARRAY_SIZE(db5500_prcmu_clocks)); - clks_register(db5500_prcc_clocks, ARRAY_SIZE(db5500_prcc_clocks)); - clks_register(db5500_clkouts, ARRAY_SIZE(db5500_clkouts)); - clks_register(u5500_clocks, ARRAY_SIZE(u5500_clocks)); + clkdev_add_table(db5500_prcmu_clocks, ARRAY_SIZE(db5500_prcmu_clocks)); + clkdev_add_table(db5500_prcc_clocks, ARRAY_SIZE(db5500_prcc_clocks)); + clkdev_add_table(db5500_clkouts, ARRAY_SIZE(db5500_clkouts)); + clkdev_add_table(u5500_clocks, ARRAY_SIZE(u5500_clocks)); db5500_boot_clk_enable(); diff --git a/arch/arm/mach-ux500/clock-db8500.c b/arch/arm/mach-ux500/clock-db8500.c index b3d9c0ba242..e2c9924d9cc 100644 --- a/arch/arm/mach-ux500/clock-db8500.c +++ b/arch/arm/mach-ux500/clock-db8500.c @@ -1281,9 +1281,9 @@ late_initcall(init_clock_states); int __init db8500_clk_init(void) { - clks_register(u8500_v2_sysclks, + clkdev_add_table(u8500_v2_sysclks, ARRAY_SIZE(u8500_v2_sysclks)); - clks_register(u8500_clocks, + clkdev_add_table(u8500_clocks, ARRAY_SIZE(u8500_clocks)); u8500_amba_clk_enable(); diff --git a/arch/arm/mach-ux500/clock.c b/arch/arm/mach-ux500/clock.c index b623ee8d864..6eb7f9d311e 100644 --- a/arch/arm/mach-ux500/clock.c +++ b/arch/arm/mach-ux500/clock.c @@ -428,13 +428,6 @@ struct clkops prcc_kclk_ops = { .disable = prcc_kclk_disable, }; -void clks_register(struct clk_lookup *clks, size_t num) -{ - unsigned int i; - - for (i = 0; i < num; i++) - clkdev_add(&clks[i]); -} /* TODO: Move to proper place */ #define PRCM_DBG_PWRCTL 0x4AC -- cgit v1.2.3