diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock33xx_data.c')
-rw-r--r-- | arch/arm/mach-omap2/clock33xx_data.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/clock33xx_data.c b/arch/arm/mach-omap2/clock33xx_data.c index 1cb79cc58089..2f26fa961da5 100644 --- a/arch/arm/mach-omap2/clock33xx_data.c +++ b/arch/arm/mach-omap2/clock33xx_data.c | |||
@@ -547,16 +547,16 @@ static struct clk mcasp1_fck = { | |||
547 | .recalc = &followparent_recalc, | 547 | .recalc = &followparent_recalc, |
548 | }; | 548 | }; |
549 | 549 | ||
550 | static struct clk smartreflex0_fck = { | 550 | static struct clk smartreflex_mpu_fck = { |
551 | .name = "smartreflex0_fck", | 551 | .name = "smartreflex_mpu_fck", |
552 | .clkdm_name = "l4_wkup_clkdm", | 552 | .clkdm_name = "l4_wkup_clkdm", |
553 | .parent = &sys_clkin_ck, | 553 | .parent = &sys_clkin_ck, |
554 | .ops = &clkops_null, | 554 | .ops = &clkops_null, |
555 | .recalc = &followparent_recalc, | 555 | .recalc = &followparent_recalc, |
556 | }; | 556 | }; |
557 | 557 | ||
558 | static struct clk smartreflex1_fck = { | 558 | static struct clk smartreflex_core_fck = { |
559 | .name = "smartreflex1_fck", | 559 | .name = "smartreflex_core_fck", |
560 | .clkdm_name = "l4_wkup_clkdm", | 560 | .clkdm_name = "l4_wkup_clkdm", |
561 | .parent = &sys_clkin_ck, | 561 | .parent = &sys_clkin_ck, |
562 | .ops = &clkops_null, | 562 | .ops = &clkops_null, |
@@ -1038,8 +1038,8 @@ static struct omap_clk am33xx_clks[] = { | |||
1038 | CLK(NULL, "mcasp1_fck", &mcasp1_fck, CK_AM33XX), | 1038 | CLK(NULL, "mcasp1_fck", &mcasp1_fck, CK_AM33XX), |
1039 | CLK("NULL", "mmc2_fck", &mmc2_fck, CK_AM33XX), | 1039 | CLK("NULL", "mmc2_fck", &mmc2_fck, CK_AM33XX), |
1040 | CLK(NULL, "mmu_fck", &mmu_fck, CK_AM33XX), | 1040 | CLK(NULL, "mmu_fck", &mmu_fck, CK_AM33XX), |
1041 | CLK(NULL, "smartreflex0_fck", &smartreflex0_fck, CK_AM33XX), | 1041 | CLK(NULL, "smartreflex_mpu_fck", &smartreflex_mpu_fck, CK_AM33XX), |
1042 | CLK(NULL, "smartreflex1_fck", &smartreflex1_fck, CK_AM33XX), | 1042 | CLK(NULL, "smartreflex_core_fck", &smartreflex_core_fck, CK_AM33XX), |
1043 | CLK(NULL, "timer1_fck", &timer1_fck, CK_AM33XX), | 1043 | CLK(NULL, "timer1_fck", &timer1_fck, CK_AM33XX), |
1044 | CLK(NULL, "timer2_fck", &timer2_fck, CK_AM33XX), | 1044 | CLK(NULL, "timer2_fck", &timer2_fck, CK_AM33XX), |
1045 | CLK(NULL, "timer3_fck", &timer3_fck, CK_AM33XX), | 1045 | CLK(NULL, "timer3_fck", &timer3_fck, CK_AM33XX), |
@@ -1072,6 +1072,8 @@ static struct omap_clk am33xx_clks[] = { | |||
1072 | CLK(NULL, "gfx_fck_div_ck", &gfx_fck_div_ck, CK_AM33XX), | 1072 | CLK(NULL, "gfx_fck_div_ck", &gfx_fck_div_ck, CK_AM33XX), |
1073 | CLK(NULL, "sysclkout_pre_ck", &sysclkout_pre_ck, CK_AM33XX), | 1073 | CLK(NULL, "sysclkout_pre_ck", &sysclkout_pre_ck, CK_AM33XX), |
1074 | CLK(NULL, "clkout2_ck", &clkout2_ck, CK_AM33XX), | 1074 | CLK(NULL, "clkout2_ck", &clkout2_ck, CK_AM33XX), |
1075 | CLK(NULL, "timer_32k_ck", &clkdiv32k_ick, CK_AM33XX), | ||
1076 | CLK(NULL, "timer_sys_ck", &sys_clkin_ck, CK_AM33XX), | ||
1075 | }; | 1077 | }; |
1076 | 1078 | ||
1077 | int __init am33xx_clk_init(void) | 1079 | int __init am33xx_clk_init(void) |