[ARM] omap: mcbsp: convert to use fck/ick clocks directly

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / clock24xx.c

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index ac038035c1c9fa7315341056d27417a86fdc10a3..ea21d55a20759dc77f174a7c3b56f85f9512e240 100644 (file)
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -139,16 +139,16 @@ static struct omap_clk omap24xx_clks[] = {
        CLK(NULL,       "gpt11_fck",    &gpt11_fck,     CK_243X | CK_242X),
        CLK(NULL,       "gpt12_ick",    &gpt12_ick,     CK_243X | CK_242X),
        CLK(NULL,       "gpt12_fck",    &gpt12_fck,     CK_243X | CK_242X),
-       CLK("omap-mcbsp.1", "mcbsp_ick", &mcbsp1_ick,   CK_243X | CK_242X),
-       CLK("omap-mcbsp.1", "mcbsp_fck", &mcbsp1_fck,   CK_243X | CK_242X),
-       CLK("omap-mcbsp.2", "mcbsp_ick", &mcbsp2_ick,   CK_243X | CK_242X),
-       CLK("omap-mcbsp.2", "mcbsp_fck", &mcbsp2_fck,   CK_243X | CK_242X),
-       CLK("omap-mcbsp.3", "mcbsp_ick", &mcbsp3_ick,   CK_243X),
-       CLK("omap-mcbsp.3", "mcbsp_fck", &mcbsp3_fck,   CK_243X),
-       CLK("omap-mcbsp.4", "mcbsp_ick", &mcbsp4_ick,   CK_243X),
-       CLK("omap-mcbsp.4", "mcbsp_fck", &mcbsp4_fck,   CK_243X),
-       CLK("omap-mcbsp.5", "mcbsp_ick", &mcbsp5_ick,   CK_243X),
-       CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck,   CK_243X),
+       CLK("omap-mcbsp.1", "ick",      &mcbsp1_ick,    CK_243X | CK_242X),
+       CLK("omap-mcbsp.1", "fck",      &mcbsp1_fck,    CK_243X | CK_242X),
+       CLK("omap-mcbsp.2", "ick",      &mcbsp2_ick,    CK_243X | CK_242X),
+       CLK("omap-mcbsp.2", "fck",      &mcbsp2_fck,    CK_243X | CK_242X),
+       CLK("omap-mcbsp.3", "ick",      &mcbsp3_ick,    CK_243X),
+       CLK("omap-mcbsp.3", "fck",      &mcbsp3_fck,    CK_243X),
+       CLK("omap-mcbsp.4", "ick",      &mcbsp4_ick,    CK_243X),
+       CLK("omap-mcbsp.4", "fck",      &mcbsp4_fck,    CK_243X),
+       CLK("omap-mcbsp.5", "ick",      &mcbsp5_ick,    CK_243X),
+       CLK("omap-mcbsp.5", "fck",      &mcbsp5_fck,    CK_243X),
        CLK("omap2_mcspi.1", "ick",     &mcspi1_ick,    CK_243X | CK_242X),
        CLK("omap2_mcspi.1", "fck",     &mcspi1_fck,    CK_243X | CK_242X),
        CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_243X | CK_242X),