[ARM] omap: mcspi: new short connection id names

... rather than the clock names themselves.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
index aca4ca42bf48..ac038035c1c9 100644
--- a/arch/arm/mach-omap2/clock24xx.c
+++ b/arch/arm/mach-omap2/clock24xx.c
@@ -149,12 +149,12 @@ static struct omap_clk omap24xx_clks[] = {
         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("omap2_mcspi.1", "mcspi_ick", &mcspi1_ick,  CK_243X | CK_242X),
-        CLK("omap2_mcspi.1", "mcspi_fck", &mcspi1_fck,  CK_243X | CK_242X),
-        CLK("omap2_mcspi.2", "mcspi_ick", &mcspi2_ick,  CK_243X | CK_242X),
-        CLK("omap2_mcspi.2", "mcspi_fck", &mcspi2_fck,  CK_243X | CK_242X),
-        CLK("omap2_mcspi.3", "mcspi_ick", &mcspi3_ick,  CK_243X),
-        CLK("omap2_mcspi.3", "mcspi_fck", &mcspi3_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),
+        CLK("omap2_mcspi.2", "fck",     &mcspi2_fck,    CK_243X | CK_242X),
+        CLK("omap2_mcspi.3", "ick",     &mcspi3_ick,    CK_243X),
+        CLK("omap2_mcspi.3", "fck",     &mcspi3_fck,    CK_243X),
         CLK(NULL,       "uart1_ick",    &uart1_ick,     CK_243X | CK_242X),
         CLK(NULL,       "uart1_fck",    &uart1_fck,     CK_243X | CK_242X),
         CLK(NULL,       "uart2_ick",    &uart2_ick,     CK_243X | CK_242X),