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

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

diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
index 07e3308da650293f51cee4a2edfe6d1205d801a8..245a7b9b560c51bcd3f4d71112f971ea544dcaab 100644 (file)
--- a/arch/arm/mach-omap2/clock34xx.c
+++ b/arch/arm/mach-omap2/clock34xx.c
@@ -137,10 +137,10 @@ static struct omap_clk omap34xx_clks[] = {
        CLK(NULL,       "ts_fck",       &ts_fck,        CK_3430ES2),
        CLK(NULL,       "usbtll_fck",   &usbtll_fck,    CK_3430ES2),
        CLK(NULL,       "core_96m_fck", &core_96m_fck,  CK_343X),
-       CLK("mmci-omap-hs.2",   "mmchs_fck",    &mmchs3_fck,    CK_3430ES2),
-       CLK("mmci-omap-hs.1",   "mmchs_fck",    &mmchs2_fck,    CK_343X),
+       CLK("mmci-omap-hs.2",   "fck",  &mmchs3_fck,    CK_3430ES2),
+       CLK("mmci-omap-hs.1",   "fck",  &mmchs2_fck,    CK_343X),
        CLK(NULL,       "mspro_fck",    &mspro_fck,     CK_343X),
-       CLK("mmci-omap-hs.0",   "mmchs_fck",    &mmchs1_fck,    CK_343X),
+       CLK("mmci-omap-hs.0",   "fck",  &mmchs1_fck,    CK_343X),
        CLK("i2c_omap.3", "fck",        &i2c3_fck,      CK_343X),
        CLK("i2c_omap.2", "fck",        &i2c2_fck,      CK_343X),
        CLK("i2c_omap.1", "fck",        &i2c1_fck,      CK_343X),
@@ -166,13 +166,13 @@ static struct omap_clk omap34xx_clks[] = {
        CLK(NULL,       "pka_ick",      &pka_ick,       CK_343X),
        CLK(NULL,       "core_l4_ick",  &core_l4_ick,   CK_343X),
        CLK(NULL,       "usbtll_ick",   &usbtll_ick,    CK_3430ES2),
-       CLK("mmci-omap-hs.2",   "mmchs_ick",    &mmchs3_ick,    CK_3430ES2),
+       CLK("mmci-omap-hs.2",   "ick",  &mmchs3_ick,    CK_3430ES2),
        CLK(NULL,       "icr_ick",      &icr_ick,       CK_343X),
        CLK(NULL,       "aes2_ick",     &aes2_ick,      CK_343X),
        CLK(NULL,       "sha12_ick",    &sha12_ick,     CK_343X),
        CLK(NULL,       "des2_ick",     &des2_ick,      CK_343X),
-       CLK("mmci-omap-hs.1",   "mmchs_ick",    &mmchs2_ick,    CK_343X),
-       CLK("mmci-omap-hs.0",   "mmchs_ick",    &mmchs1_ick,    CK_343X),
+       CLK("mmci-omap-hs.1",   "ick",  &mmchs2_ick,    CK_343X),
+       CLK("mmci-omap-hs.0",   "ick",  &mmchs1_ick,    CK_343X),
        CLK(NULL,       "mspro_ick",    &mspro_ick,     CK_343X),
        CLK("omap_hdq.0", "ick",        &hdq_ick,       CK_343X),
        CLK("omap2_mcspi.4", "ick",     &mcspi4_ick,    CK_343X),