OMAP clock: add OMAP chip family-specific clk_register() option

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / clock24xx.c

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index 67974d61d4bfa4cac096d1f105ffd5b385760386..9e311aa0cb5fab71f7977a69085d3c9283ff2d80 100644 (file)
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -450,6 +450,7 @@ void omap2_clk_init_cpufreq_table(struct cpufreq_frequency_table **table)
 #endif
 
 static struct clk_functions omap2_clk_functions = {
+       .clk_register           = omap2_clk_register,
        .clk_enable             = omap2_clk_enable,
        .clk_disable            = omap2_clk_disable,
        .clk_round_rate         = omap2_clk_round_rate,
@@ -578,13 +579,11 @@ int __init omap2_clk_init(void)
 
                if ((*clkp)->flags & CLOCK_IN_OMAP242X && cpu_is_omap2420()) {
                        clk_register(*clkp);
-                       omap2_init_clk_clkdm(*clkp);
                        continue;
                }
 
                if ((*clkp)->flags & CLOCK_IN_OMAP243X && cpu_is_omap2430()) {
                        clk_register(*clkp);
-                       omap2_init_clk_clkdm(*clkp);
                        continue;
                }
        }