recipes/linux/linux-omap-pm/fix-dpll-m4.diff

   1 From linux-omap-owner@vger.kernel.org Mon Dec 08 14:41:05 2008
   2
   3 This fixes commit e42218d45afbc3e654e289e021e6b80c657b16c2. The commit
   4 was based on old kernel tree, and with bad luck applied ok but to wrong
   5 position, modifying dpll4_m6_ck instead of dpll4_m4_ck.
   6
   7 Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
   8 ---
   9  arch/arm/mach-omap2/clock34xx.h |    4 ++--
  10  1 files changed, 2 insertions(+), 2 deletions(-)
  11
  12 diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h
  13 index 1c2b49f..5357507 100644
  14 --- a/arch/arm/mach-omap2/clock34xx.h
  15 +++ b/arch/arm/mach-omap2/clock34xx.h
  16 @@ -825,6 +825,8 @@ static struct clk dpll4_m4_ck = {
  17                                 PARENT_CONTROLS_CLOCK,
  18         .clkdm          = { .name = "dpll4_clkdm" },
  19         .recalc         = &omap2_clksel_recalc,
  20 +       .set_rate       = &omap2_clksel_set_rate,
  21 +       .round_rate     = &omap2_clksel_round_rate,
  22  };
  23
  24  /* The PWRDN bit is apparently only available on 3430ES2 and above */
  25 @@ -879,8 +881,6 @@ static struct clk dpll4_m6_ck = {
  26                                 PARENT_CONTROLS_CLOCK,
  27         .clkdm          = { .name = "dpll4_clkdm" },
  28         .recalc         = &omap2_clksel_recalc,
  29 -       .set_rate       = &omap2_clksel_set_rate,
  30 -       .round_rate     = &omap2_clksel_round_rate,
  31  };
  32
  33  /* The PWRDN bit is apparently only available on 3430ES2 and above */
  34 --
  35 1.6.0.3
  36
  37