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

Rather than introducing a special 'mcbsp_clk' with code behind it in
mach-omap*/mcbsp.c to handle the SoC specifics, arrange for the mcbsp
driver to be like any other driver.  mcbsp requests its fck and ick
clocks directly, and the SoC specific code deals with selecting the
correct clock.

There is one oddity to deal with - OMAP1 fiddles with the DSP clocks
and DSP reset, so we move this to the two callback functions.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 10 insertions, 10 deletions

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index d0bfae5a2f41..a70aa2eaf053 100644
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -144,8 +144,8 @@ static struct omap_clk omap34xx_clks[] = {
         CLK("i2c_omap.3", "i2c_fck",    &i2c3_fck,      CK_343X),
         CLK("i2c_omap.2", "i2c_fck",    &i2c2_fck,      CK_343X),
         CLK("i2c_omap.1", "i2c_fck",    &i2c1_fck,      CK_343X),
-        CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck,   CK_343X),
-        CLK("omap-mcbsp.1", "mcbsp_fck", &mcbsp1_fck,   CK_343X),
+        CLK("omap-mcbsp.5", "fck",      &mcbsp5_fck,    CK_343X),
+        CLK("omap-mcbsp.1", "fck",      &mcbsp1_fck,    CK_343X),
         CLK(NULL,       "core_48m_fck", &core_48m_fck,  CK_343X),
         CLK("omap2_mcspi.4", "fck",     &mcspi4_fck,    CK_343X),
         CLK("omap2_mcspi.3", "fck",     &mcspi3_fck,    CK_343X),
@@ -186,8 +186,8 @@ static struct omap_clk omap34xx_clks[] = {
         CLK(NULL,       "uart1_ick",    &uart1_ick,     CK_343X),
         CLK(NULL,       "gpt11_ick",    &gpt11_ick,     CK_343X),
         CLK(NULL,       "gpt10_ick",    &gpt10_ick,     CK_343X),
-        CLK("omap-mcbsp.5", "mcbsp_ick", &mcbsp5_ick,   CK_343X),
-        CLK("omap-mcbsp.1", "mcbsp_ick", &mcbsp1_ick,   CK_343X),
+        CLK("omap-mcbsp.5", "ick",      &mcbsp5_ick,    CK_343X),
+        CLK("omap-mcbsp.1", "ick",      &mcbsp1_ick,    CK_343X),
         CLK(NULL,       "fac_ick",      &fac_ick,       CK_3430ES1),
         CLK(NULL,       "mailboxes_ick", &mailboxes_ick, CK_343X),
         CLK(NULL,       "omapctrl_ick", &omapctrl_ick,  CK_343X),
@@ -257,12 +257,12 @@ static struct omap_clk omap34xx_clks[] = {
         CLK(NULL,       "gpt4_ick",     &gpt4_ick,      CK_343X),
         CLK(NULL,       "gpt3_ick",     &gpt3_ick,      CK_343X),
         CLK(NULL,       "gpt2_ick",     &gpt2_ick,      CK_343X),
-        CLK("omap-mcbsp.2", "mcbsp_ick", &mcbsp2_ick,   CK_343X),
-        CLK("omap-mcbsp.3", "mcbsp_ick", &mcbsp3_ick,   CK_343X),
-        CLK("omap-mcbsp.4", "mcbsp_ick", &mcbsp4_ick,   CK_343X),
-        CLK("omap-mcbsp.2", "mcbsp_fck", &mcbsp2_fck,   CK_343X),
-        CLK("omap-mcbsp.3", "mcbsp_fck", &mcbsp3_fck,   CK_343X),
-        CLK("omap-mcbsp.4", "mcbsp_fck", &mcbsp4_fck,   CK_343X),
+        CLK("omap-mcbsp.2", "ick",      &mcbsp2_ick,    CK_343X),
+        CLK("omap-mcbsp.3", "ick",      &mcbsp3_ick,    CK_343X),
+        CLK("omap-mcbsp.4", "ick",      &mcbsp4_ick,    CK_343X),
+        CLK("omap-mcbsp.2", "fck",      &mcbsp2_fck,    CK_343X),
+        CLK("omap-mcbsp.3", "fck",      &mcbsp3_fck,    CK_343X),
+        CLK("omap-mcbsp.4", "fck",      &mcbsp4_fck,    CK_343X),
         CLK(NULL,       "emu_src_ck",   &emu_src_ck,    CK_343X),
         CLK(NULL,       "pclk_fck",     &pclk_fck,      CK_343X),
         CLK(NULL,       "pclkx2_fck",   &pclkx2_fck,    CK_343X),