diff options
-rw-r--r-- | arch/arm/plat-omap/mcbsp.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index 196aac3ac329..ade9a0fa6ef6 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c | |||
@@ -75,8 +75,6 @@ static struct clk *mcbsp1_ick = 0; | |||
75 | static struct clk *mcbsp1_fck = 0; | 75 | static struct clk *mcbsp1_fck = 0; |
76 | static struct clk *mcbsp2_ick = 0; | 76 | static struct clk *mcbsp2_ick = 0; |
77 | static struct clk *mcbsp2_fck = 0; | 77 | static struct clk *mcbsp2_fck = 0; |
78 | static struct clk *sys_ck = 0; | ||
79 | static struct clk *sys_clkout = 0; | ||
80 | #endif | 78 | #endif |
81 | 79 | ||
82 | static void omap_mcbsp_dump_reg(u8 id) | 80 | static void omap_mcbsp_dump_reg(u8 id) |
@@ -232,7 +230,6 @@ static void omap2_mcbsp2_mux_setup(void) | |||
232 | omap_cfg_reg(W15_24XX_MCBSP2_DR); | 230 | omap_cfg_reg(W15_24XX_MCBSP2_DR); |
233 | omap_cfg_reg(V15_24XX_MCBSP2_DX); | 231 | omap_cfg_reg(V15_24XX_MCBSP2_DX); |
234 | omap_cfg_reg(V14_24XX_GPIO117); | 232 | omap_cfg_reg(V14_24XX_GPIO117); |
235 | omap_cfg_reg(W14_24XX_SYS_CLKOUT); | ||
236 | } | 233 | } |
237 | #endif | 234 | #endif |
238 | 235 | ||
@@ -984,13 +981,7 @@ static int __init omap_mcbsp_init(void) | |||
984 | if (cpu_is_omap24xx()) { | 981 | if (cpu_is_omap24xx()) { |
985 | mcbsp_info = mcbsp_24xx; | 982 | mcbsp_info = mcbsp_24xx; |
986 | mcbsp_count = ARRAY_SIZE(mcbsp_24xx); | 983 | mcbsp_count = ARRAY_SIZE(mcbsp_24xx); |
987 | |||
988 | /* REVISIT: where's the right place? */ | ||
989 | omap2_mcbsp2_mux_setup(); | 984 | omap2_mcbsp2_mux_setup(); |
990 | sys_ck = clk_get(0, "sys_ck"); | ||
991 | sys_clkout = clk_get(0, "sys_clkout"); | ||
992 | clk_set_parent(sys_clkout, sys_ck); | ||
993 | clk_enable(sys_clkout); | ||
994 | } | 985 | } |
995 | #endif | 986 | #endif |
996 | for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) { | 987 | for (i = 0; i < OMAP_MAX_MCBSP_COUNT ; i++) { |