Merge branch 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux...

TI-Feature: power_management
TI-Tree: git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree.git
TI-Branch: pm-linux-3.8.y

* 'pm-linux-3.8.y' of git://git.ti.com/~kristo/ti-linux-kernel/pm-linux-feature-tree:
  ARM: OMAP2+: Enable cpufreq-cpu0 Config options for cpufreq
  Arm: OMAP5: Clock: Update the dependent clocks based on the MPU frequency
  ARM: OMAP5: Cpufreq: Enable Duty Cycle Correction(DCC)
  ARM: OMAP5: Cpufreq: Enable cpufreq for OMAP5

Signed-off-by: Dan Murphy <dmurphy@ti.com>

diff --cc arch/arm/boot/dts/omap5.dtsi
Simple merge

diff --cc arch/arm/configs/omap2plus_defconfig
Simple merge

diff --cc arch/arm/mach-omap2/cclock54xx_data.c
index 47cc008907a38fd2dfaaf5b132ff9f5c17a2faee,0784db08e7fab7f379d562accb516b59db2384f6..97bd49e8eccd0b691c1cdc68f5c8b9ca5083a4d5
--- 1/arch/arm/mach-omap2/cclock54xx_data.c
--- 2/arch/arm/mach-omap2/cclock54xx_data.c
+++ b/arch/arm/mach-omap2/cclock54xx_data.c
@@@ -1454,18 -1465,9 +1466,19 @@@ static struct omap_clk omap54xx_clks[] 
        CLK("4013a000.timer",   "timer_sys_ck",         &dss_syc_gfclk_div,     CK_54XX),
        CLK("4013c000.timer",   "timer_sys_ck",         &dss_syc_gfclk_div,     CK_54XX),
        CLK("4013e000.timer",   "timer_sys_ck",         &dss_syc_gfclk_div,     CK_54XX),
+       CLK("cpu0",   NULL,   &dpll_mpu_ck,   CK_54XX),
  };
  
 +static struct reparent_init_clks reparent_clks[] = {
 +      { .name = "abe_dpll_clk_mux", .parent = "sys_32k_ck" }
 +};
 +
 +static struct rate_init_clks rate_clks[] = {
 +      { .name = "dpll_usb_ck", .rate = OMAP5_DPLL_USB_DEFFREQ },
 +      { .name = "dpll_usb_m2_ck", .rate = OMAP5_DPLL_USB_DEFFREQ/2 },
 +      { .name = "dpll_abe_ck", .rate = OMAP5_DPLL_ABE_DEFFREQ },
 +};
 +
  int __init omap5xxx_clk_init(void)
  {
        u32 cpu_clkflg;

diff --cc arch/arm/mach-omap2/clock.h
Simple merge

diff --cc arch/arm/mach-omap2/dpll3xxx.c
Simple merge