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

[karo-tx-linux.git] / arch / arm / mach-omap2 / clock33xx_data.c

diff --git a/arch/arm/mach-omap2/clock33xx_data.c b/arch/arm/mach-omap2/clock33xx_data.c
index 1a45d6bd253921a9b8e8f646f568c868a0b4df85..88fa9494d5e9f4fe858e67aca9dad8a53fbab762 100644 (file)
--- a/arch/arm/mach-omap2/clock33xx_data.c
+++ b/arch/arm/mach-omap2/clock33xx_data.c
@@ -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 @@ 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),