Merge tag 'omap-devel-b-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git...

Some OMAP PRCM updates for 3.5.  Includes some clock, clockdomain,
powerdomain, PRM, and CM changes.

diff --combined arch/arm/mach-omap2/clock.c
index d9f4931,77db067..5c4e665
--- 1/arch/arm/mach-omap2/clock.c
--- 2/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@@ -439,7 -439,7 +439,7 @@@ void omap2_clk_disable_unused(struct cl
                clk->ops->disable(clk);
        }
        if (clk->clkdm != NULL)
-               pwrdm_clkdm_state_switch(clk->clkdm);
+               pwrdm_state_switch(clk->clkdm->pwrdm.ptr);
  }
  #endif
  
@@@ -536,5 -536,10 +536,5 @@@ struct clk_functions omap2_clk_function
        .clk_set_rate           = omap2_clk_set_rate,
        .clk_set_parent         = omap2_clk_set_parent,
        .clk_disable_unused     = omap2_clk_disable_unused,
 -#ifdef CONFIG_CPU_FREQ
 -      /* These will be removed when the OPP code is integrated */
 -      .clk_init_cpufreq_table = omap2_clk_init_cpufreq_table,
 -      .clk_exit_cpufreq_table = omap2_clk_exit_cpufreq_table,
 -#endif
  };