Merge tag 'for_3.8-pm-sr' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

OMAP: SmartReflex: pass device-independent data via platform_data

diff --combined arch/arm/mach-omap2/clock33xx_data.c
index 1a45d6bd253921a9b8e8f646f568c868a0b4df85,0bf5458b72f995481ad174ad806e7b4ec8f95f7a..88fa9494d5e9f4fe858e67aca9dad8a53fbab762
--- 1/arch/arm/mach-omap2/clock33xx_data.c
--- 2/arch/arm/mach-omap2/clock33xx_data.c
+++ b/arch/arm/mach-omap2/clock33xx_data.c
@@@ -548,16 -548,16 +548,16 @@@ static struct clk mcasp1_fck = 
        .recalc         = &followparent_recalc,
  };
  
- static struct clk smartreflex0_fck = {
-       .name           = "smartreflex0_fck",
+ static struct clk smartreflex_mpu_fck = {
+       .name           = "smartreflex_mpu_fck",
        .clkdm_name     = "l4_wkup_clkdm",
        .parent         = &sys_clkin_ck,
        .ops            = &clkops_null,
        .recalc         = &followparent_recalc,
  };
  
- static struct clk smartreflex1_fck = {
-       .name           = "smartreflex1_fck",
+ static struct clk smartreflex_core_fck = {
+       .name           = "smartreflex_core_fck",
        .clkdm_name     = "l4_wkup_clkdm",
        .parent         = &sys_clkin_ck,
        .ops            = &clkops_null,
@@@ -1039,8 -1039,8 +1039,8 @@@ static struct omap_clk am33xx_clks[] = 
        CLK(NULL,       "mcasp1_fck",           &mcasp1_fck,    CK_AM33XX),
        CLK("NULL",     "mmc2_fck",             &mmc2_fck,      CK_AM33XX),
        CLK(NULL,       "mmu_fck",              &mmu_fck,       CK_AM33XX),
-       CLK(NULL,       "smartreflex0_fck",     &smartreflex0_fck,      CK_AM33XX),
-       CLK(NULL,       "smartreflex1_fck",     &smartreflex1_fck,      CK_AM33XX),
+       CLK(NULL,       "smartreflex_mpu_fck",  &smartreflex_mpu_fck,   CK_AM33XX),
+       CLK(NULL,       "smartreflex_core_fck", &smartreflex_core_fck,  CK_AM33XX),
        CLK(NULL,       "timer1_fck",           &timer1_fck,    CK_AM33XX),
        CLK(NULL,       "timer2_fck",           &timer2_fck,    CK_AM33XX),
        CLK(NULL,       "timer3_fck",           &timer3_fck,    CK_AM33XX),
@@@ -1073,8 -1073,6 +1073,8 @@@
        CLK(NULL,       "gfx_fck_div_ck",       &gfx_fck_div_ck,        CK_AM33XX),
        CLK(NULL,       "sysclkout_pre_ck",     &sysclkout_pre_ck,      CK_AM33XX),
        CLK(NULL,       "clkout2_ck",           &clkout2_ck,    CK_AM33XX),
 +      CLK(NULL,       "timer_32k_ck",         &clkdiv32k_ick, CK_AM33XX),
 +      CLK(NULL,       "timer_sys_ck",         &sys_clkin_ck,  CK_AM33XX),
  };
  
  int __init am33xx_clk_init(void)

diff --combined arch/arm/mach-omap2/clock44xx_data.c
index 6efc30c961a5806dbecff3fb595bab1abfbc9082,35e943fb1a36144d4b7058f1860c992c6feecfd7..dc92e5f4e78eb1e8da20ee1ec1d466b19d4b7bfb
--- 1/arch/arm/mach-omap2/clock44xx_data.c
--- 2/arch/arm/mach-omap2/clock44xx_data.c
+++ b/arch/arm/mach-omap2/clock44xx_data.c
@@@ -3226,9 -3226,9 +3226,9 @@@ static struct omap_clk omap44xx_clks[] 
        CLK(NULL,       "slimbus2_fclk_0",              &slimbus2_fclk_0,       CK_443X),
        CLK(NULL,       "slimbus2_slimbus_clk",         &slimbus2_slimbus_clk,  CK_443X),
        CLK(NULL,       "slimbus2_fck",                 &slimbus2_fck,  CK_443X),
-       CLK(NULL,       "smartreflex_core_fck",         &smartreflex_core_fck,  CK_443X),
-       CLK(NULL,       "smartreflex_iva_fck",          &smartreflex_iva_fck,   CK_443X),
-       CLK(NULL,       "smartreflex_mpu_fck",          &smartreflex_mpu_fck,   CK_443X),
+       CLK(NULL,       "smartreflex_core_fck", &smartreflex_core_fck,  CK_443X),
+       CLK(NULL,       "smartreflex_iva_fck",  &smartreflex_iva_fck,   CK_443X),
+       CLK(NULL,       "smartreflex_mpu_fck",  &smartreflex_mpu_fck,   CK_443X),
        CLK(NULL,       "timer1_fck",                   &timer1_fck,    CK_443X),
        CLK(NULL,       "timer10_fck",                  &timer10_fck,   CK_443X),
        CLK(NULL,       "timer11_fck",                  &timer11_fck,   CK_443X),
@@@ -3294,7 -3294,7 +3294,7 @@@
        CLK(NULL,       "auxclk5_src_ck",               &auxclk5_src_ck,        CK_443X),
        CLK(NULL,       "auxclk5_ck",                   &auxclk5_ck,    CK_443X),
        CLK(NULL,       "auxclkreq5_ck",                &auxclkreq5_ck, CK_443X),
 -      CLK(NULL,       "gpmc_ck",                      &dummy_ck,      CK_443X),
 +      CLK("omap-gpmc",        "fck",                          &dummy_ck,      CK_443X),
        CLK("omap_i2c.1",       "ick",                          &dummy_ck,      CK_443X),
        CLK("omap_i2c.2",       "ick",                          &dummy_ck,      CK_443X),
        CLK("omap_i2c.3",       "ick",                          &dummy_ck,      CK_443X),