omap: Use separate init_irq functions to avoid cpu_is_omap tests early

[mv-sheeva.git] / arch / arm / mach-omap2 / clock2430_data.c

diff --git a/arch/arm/mach-omap2/clock2430_data.c b/arch/arm/mach-omap2/clock2430_data.c
index 5c2a075fd82c81b5f6b2fb50d9f69722b79692b2..0c79d39e3021f02f59f54ab9aedfd9e10942e44e 100644 (file)
--- a/arch/arm/mach-omap2/clock2430_data.c
+++ b/arch/arm/mach-omap2/clock2430_data.c
@@ -1894,10 +1894,10 @@ static struct omap_clk omap2430_clks[] = {
        CLK(NULL,       "mdm_ick",      &mdm_ick,       CK_243X),
        CLK(NULL,       "mdm_osc_ck",   &mdm_osc_ck,    CK_243X),
        /* DSS domain clocks */
-       CLK("omapdss",  "ick",          &dss_ick,       CK_243X),
-       CLK("omapdss",  "dss1_fck",     &dss1_fck,      CK_243X),
-       CLK("omapdss",  "dss2_fck",     &dss2_fck,      CK_243X),
-       CLK("omapdss",  "tv_fck",       &dss_54m_fck,   CK_243X),
+       CLK("omapdss_dss",      "ick",          &dss_ick,       CK_243X),
+       CLK("omapdss_dss",      "fck",          &dss1_fck,      CK_243X),
+       CLK("omapdss_dss",      "sys_clk",      &dss2_fck,      CK_243X),
+       CLK("omapdss_dss",      "tv_clk",       &dss_54m_fck,   CK_243X),
        /* L3 domain clocks */
        CLK(NULL,       "core_l3_ck",   &core_l3_ck,    CK_243X),
        CLK(NULL,       "ssi_fck",      &ssi_ssr_sst_fck, CK_243X),
@@ -1989,15 +1989,15 @@ static struct omap_clk omap2430_clks[] = {
        CLK(NULL,       "pka_ick",      &pka_ick,       CK_243X),
        CLK(NULL,       "usb_fck",      &usb_fck,       CK_243X),
        CLK("musb-omap2430",    "ick",  &usbhs_ick,     CK_243X),
-       CLK("mmci-omap-hs.0", "ick",    &mmchs1_ick,    CK_243X),
-       CLK("mmci-omap-hs.0", "fck",    &mmchs1_fck,    CK_243X),
-       CLK("mmci-omap-hs.1", "ick",    &mmchs2_ick,    CK_243X),
-       CLK("mmci-omap-hs.1", "fck",    &mmchs2_fck,    CK_243X),
+       CLK("omap_hsmmc.0", "ick",      &mmchs1_ick,    CK_243X),
+       CLK("omap_hsmmc.0", "fck",      &mmchs1_fck,    CK_243X),
+       CLK("omap_hsmmc.1", "ick",      &mmchs2_ick,    CK_243X),
+       CLK("omap_hsmmc.1", "fck",      &mmchs2_fck,    CK_243X),
        CLK(NULL,       "gpio5_ick",    &gpio5_ick,     CK_243X),
        CLK(NULL,       "gpio5_fck",    &gpio5_fck,     CK_243X),
        CLK(NULL,       "mdm_intc_ick", &mdm_intc_ick,  CK_243X),
-       CLK("mmci-omap-hs.0", "mmchsdb_fck",    &mmchsdb1_fck,  CK_243X),
-       CLK("mmci-omap-hs.1", "mmchsdb_fck",    &mmchsdb2_fck,  CK_243X),
+       CLK("omap_hsmmc.0", "mmchsdb_fck",      &mmchsdb1_fck,  CK_243X),
+       CLK("omap_hsmmc.1", "mmchsdb_fck",      &mmchsdb2_fck,  CK_243X),
 };
 
 /*