]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
OMAP: Fix dpll4_m4_ck clk_set_rate()
authorTomi Valkeinen <tomi.valkeinen@nokia.com>
Mon, 8 Dec 2008 13:16:49 +0000 (15:16 +0200)
committerTony Lindgren <tony@atomide.com>
Tue, 16 Dec 2008 00:26:54 +0000 (16:26 -0800)
This fixes commit e42218d45afbc3e654e289e021e6b80c657b16c2. The commit
was based on old kernel tree, and with bad luck applied ok but to wrong
position, modifying dpll4_m6_ck instead of dpll4_m4_ck.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/clock34xx.h

index 1c2b49f32747d72acdb63ba75e248240c520aeec..5357507c413473b1d72199fbfb9f74ee69819b21 100644 (file)
@@ -825,6 +825,8 @@ static struct clk dpll4_m4_ck = {
                                PARENT_CONTROLS_CLOCK,
        .clkdm          = { .name = "dpll4_clkdm" },
        .recalc         = &omap2_clksel_recalc,
+       .set_rate       = &omap2_clksel_set_rate,
+       .round_rate     = &omap2_clksel_round_rate,
 };
 
 /* The PWRDN bit is apparently only available on 3430ES2 and above */
@@ -879,8 +881,6 @@ static struct clk dpll4_m6_ck = {
                                PARENT_CONTROLS_CLOCK,
        .clkdm          = { .name = "dpll4_clkdm" },
        .recalc         = &omap2_clksel_recalc,
-       .set_rate       = &omap2_clksel_set_rate,
-       .round_rate     = &omap2_clksel_round_rate,
 };
 
 /* The PWRDN bit is apparently only available on 3430ES2 and above */