ARM: OMAP2+: hwmod: get rid of all omap_clk_get_by_name usage

[deliverable/linux.git] / arch / arm / mach-omap2 / clock3xxx_data.c

diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index f1ee4ec53d4afbaba1fb34ae9203abbae8f88c43..1f42c9d5ecf3131b5f55fd6d2152912d44b2d9ff 100644 (file)
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3242,11 +3242,13 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK(NULL,       "dpll3_m2x2_ck", &dpll3_m2x2_ck, CK_3XXX),
        CLK(NULL,       "dpll3_m3_ck",  &dpll3_m3_ck,   CK_3XXX),
        CLK(NULL,       "dpll3_m3x2_ck", &dpll3_m3x2_ck, CK_3XXX),
+       CLK(NULL,       "emu_core_alwon_ck", &emu_core_alwon_ck, CK_3XXX),
        CLK("etb",      "emu_core_alwon_ck", &emu_core_alwon_ck, CK_3XXX),
        CLK(NULL,       "dpll4_ck",     &dpll4_ck,      CK_3XXX),
        CLK(NULL,       "dpll4_x2_ck",  &dpll4_x2_ck,   CK_3XXX),
        CLK(NULL,       "omap_192m_alwon_fck", &omap_192m_alwon_fck, CK_36XX),
        CLK(NULL,       "omap_96m_alwon_fck", &omap_96m_alwon_fck, CK_3XXX),
+       CLK(NULL,       "omap_96m_alwon_fck_3630", &omap_96m_alwon_fck_3630, CK_36XX),
        CLK(NULL,       "omap_96m_fck", &omap_96m_fck,  CK_3XXX),
        CLK(NULL,       "cm_96m_fck",   &cm_96m_fck,    CK_3XXX),
        CLK(NULL,       "omap_54m_fck", &omap_54m_fck,  CK_3XXX),
@@ -3262,6 +3264,7 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK(NULL,       "dpll4_m5x2_ck", &dpll4_m5x2_ck, CK_3XXX),
        CLK(NULL,       "dpll4_m6_ck",  &dpll4_m6_ck,   CK_3XXX),
        CLK(NULL,       "dpll4_m6x2_ck", &dpll4_m6x2_ck, CK_3XXX),
+       CLK(NULL,       "emu_per_alwon_ck", &emu_per_alwon_ck, CK_3XXX),
        CLK("etb",      "emu_per_alwon_ck", &emu_per_alwon_ck, CK_3XXX),
        CLK(NULL,       "dpll5_ck",     &dpll5_ck,      CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
        CLK(NULL,       "dpll5_m2_ck",  &dpll5_m2_ck,   CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
@@ -3271,6 +3274,7 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK(NULL,       "dpll1_fck",    &dpll1_fck,     CK_3XXX),
        CLK(NULL,       "mpu_ck",       &mpu_ck,        CK_3XXX),
        CLK(NULL,       "arm_fck",      &arm_fck,       CK_3XXX),
+       CLK(NULL,       "emu_mpu_alwon_ck", &emu_mpu_alwon_ck, CK_3XXX),
        CLK("etb",      "emu_mpu_alwon_ck", &emu_mpu_alwon_ck, CK_3XXX),
        CLK(NULL,       "dpll2_fck",    &dpll2_fck,     CK_34XX | CK_36XX),
        CLK(NULL,       "iva2_ck",      &iva2_ck,       CK_34XX | CK_36XX),
@@ -3315,6 +3319,7 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK(NULL,       "fshostusb_fck", &fshostusb_fck, CK_3430ES1),
        CLK(NULL,       "core_12m_fck", &core_12m_fck,  CK_3XXX),
        CLK("omap_hdq.0",       "fck",  &hdq_fck,       CK_3XXX),
+       CLK(NULL,       "hdq_fck",      &hdq_fck,       CK_3XXX),
        CLK(NULL,       "ssi_ssr_fck",  &ssi_ssr_fck_3430es1,   CK_3430ES1),
        CLK(NULL,       "ssi_ssr_fck",  &ssi_ssr_fck_3430es2,   CK_3430ES2PLUS | CK_36XX),
        CLK(NULL,       "ssi_sst_fck",  &ssi_sst_fck_3430es1,   CK_3430ES1),
@@ -3322,6 +3327,8 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK(NULL,       "core_l3_ick",  &core_l3_ick,   CK_3XXX),
        CLK("musb-omap2430",    "ick",  &hsotgusb_ick_3430es1,  CK_3430ES1),
        CLK("musb-omap2430",    "ick",  &hsotgusb_ick_3430es2,  CK_3430ES2PLUS | CK_36XX),
+       CLK(NULL,       "hsotgusb_ick", &hsotgusb_ick_3430es1,  CK_3430ES1),
+       CLK(NULL,       "hsotgusb_ick", &hsotgusb_ick_3430es2,  CK_3430ES2PLUS | CK_36XX),
        CLK(NULL,       "sdrc_ick",     &sdrc_ick,      CK_3XXX),
        CLK(NULL,       "gpmc_fck",     &gpmc_fck,      CK_3XXX),
        CLK(NULL,       "security_l3_ick", &security_l3_ick, CK_34XX | CK_36XX),
@@ -3331,27 +3338,40 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK("usbhs_omap",       "usbtll_ick",   &usbtll_ick,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
        CLK("usbhs_tll",        "usbtll_ick",   &usbtll_ick,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
        CLK("omap_hsmmc.2",     "ick",  &mmchs3_ick,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+       CLK(NULL,       "mmchs3_ick",   &mmchs3_ick,    CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
        CLK(NULL,       "icr_ick",      &icr_ick,       CK_34XX | CK_36XX),
        CLK("omap-aes", "ick",  &aes2_ick,      CK_34XX | CK_36XX),
        CLK("omap-sham",        "ick",  &sha12_ick,     CK_34XX | CK_36XX),
        CLK(NULL,       "des2_ick",     &des2_ick,      CK_34XX | CK_36XX),
        CLK("omap_hsmmc.1",     "ick",  &mmchs2_ick,    CK_3XXX),
        CLK("omap_hsmmc.0",     "ick",  &mmchs1_ick,    CK_3XXX),
+       CLK(NULL,       "mmchs2_ick",   &mmchs2_ick,    CK_3XXX),
+       CLK(NULL,       "mmchs1_ick",   &mmchs1_ick,    CK_3XXX),
        CLK(NULL,       "mspro_ick",    &mspro_ick,     CK_34XX | CK_36XX),
        CLK("omap_hdq.0", "ick",        &hdq_ick,       CK_3XXX),
+       CLK(NULL,       "hdq_ick",      &hdq_ick,       CK_3XXX),
        CLK("omap2_mcspi.4", "ick",     &mcspi4_ick,    CK_3XXX),
        CLK("omap2_mcspi.3", "ick",     &mcspi3_ick,    CK_3XXX),
        CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_3XXX),
        CLK("omap2_mcspi.1", "ick",     &mcspi1_ick,    CK_3XXX),
+       CLK(NULL,       "mcspi4_ick",   &mcspi4_ick,    CK_3XXX),
+       CLK(NULL,       "mcspi3_ick",   &mcspi3_ick,    CK_3XXX),
+       CLK(NULL,       "mcspi2_ick",   &mcspi2_ick,    CK_3XXX),
+       CLK(NULL,       "mcspi1_ick",   &mcspi1_ick,    CK_3XXX),
        CLK("omap_i2c.3", "ick",        &i2c3_ick,      CK_3XXX),
        CLK("omap_i2c.2", "ick",        &i2c2_ick,      CK_3XXX),
        CLK("omap_i2c.1", "ick",        &i2c1_ick,      CK_3XXX),
+       CLK(NULL,       "i2c3_ick",     &i2c3_ick,      CK_3XXX),
+       CLK(NULL,       "i2c2_ick",     &i2c2_ick,      CK_3XXX),
+       CLK(NULL,       "i2c1_ick",     &i2c1_ick,      CK_3XXX),
        CLK(NULL,       "uart2_ick",    &uart2_ick,     CK_3XXX),
        CLK(NULL,       "uart1_ick",    &uart1_ick,     CK_3XXX),
        CLK(NULL,       "gpt11_ick",    &gpt11_ick,     CK_3XXX),
        CLK(NULL,       "gpt10_ick",    &gpt10_ick,     CK_3XXX),
        CLK("omap-mcbsp.5", "ick",      &mcbsp5_ick,    CK_3XXX),
        CLK("omap-mcbsp.1", "ick",      &mcbsp1_ick,    CK_3XXX),
+       CLK(NULL,       "mcbsp5_ick",   &mcbsp5_ick,    CK_3XXX),
+       CLK(NULL,       "mcbsp1_ick",   &mcbsp1_ick,    CK_3XXX),
        CLK(NULL,       "fac_ick",      &fac_ick,       CK_3430ES1),
        CLK(NULL,       "mailboxes_ick", &mailboxes_ick, CK_34XX | CK_36XX),
        CLK(NULL,       "omapctrl_ick", &omapctrl_ick,  CK_3XXX),
@@ -3370,7 +3390,9 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK(NULL,       "dss_96m_fck",  &dss_96m_fck,   CK_3XXX),
        CLK(NULL,       "dss2_alwon_fck",       &dss2_alwon_fck, CK_3XXX),
        CLK("omapdss_dss",      "ick",          &dss_ick_3430es1,       CK_3430ES1),
+       CLK(NULL,       "dss_ick",              &dss_ick_3430es1,       CK_3430ES1),
        CLK("omapdss_dss",      "ick",          &dss_ick_3430es2,       CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
+       CLK(NULL,       "dss_ick",              &dss_ick_3430es2,       CK_3430ES2PLUS | CK_AM35XX | CK_36XX),
        CLK(NULL,       "cam_mclk",     &cam_mclk,      CK_34XX | CK_36XX),
        CLK(NULL,       "cam_ick",      &cam_ick,       CK_34XX | CK_36XX),
        CLK(NULL,       "csi2_96m_fck", &csi2_96m_fck,  CK_34XX | CK_36XX),
@@ -3397,6 +3419,7 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK(NULL,       "wkup_l4_ick",  &wkup_l4_ick,   CK_34XX | CK_36XX),
        CLK(NULL,       "usim_ick",     &usim_ick,      CK_3430ES2PLUS | CK_36XX),
        CLK("omap_wdt", "ick",          &wdt2_ick,      CK_3XXX),
+       CLK(NULL,       "wdt2_ick",     &wdt2_ick,      CK_3XXX),
        CLK(NULL,       "wdt1_ick",     &wdt1_ick,      CK_3XXX),
        CLK(NULL,       "gpio1_ick",    &gpio1_ick,     CK_3XXX),
        CLK(NULL,       "omap_32ksync_ick", &omap_32ksync_ick, CK_3XXX),
@@ -3442,9 +3465,13 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK("omap-mcbsp.2", "ick",      &mcbsp2_ick,    CK_3XXX),
        CLK("omap-mcbsp.3", "ick",      &mcbsp3_ick,    CK_3XXX),
        CLK("omap-mcbsp.4", "ick",      &mcbsp4_ick,    CK_3XXX),
+       CLK(NULL,       "mcbsp4_ick",   &mcbsp2_ick,    CK_3XXX),
+       CLK(NULL,       "mcbsp3_ick",   &mcbsp3_ick,    CK_3XXX),
+       CLK(NULL,       "mcbsp2_ick",   &mcbsp4_ick,    CK_3XXX),
        CLK(NULL,       "mcbsp2_fck",   &mcbsp2_fck,    CK_3XXX),
        CLK(NULL,       "mcbsp3_fck",   &mcbsp3_fck,    CK_3XXX),
        CLK(NULL,       "mcbsp4_fck",   &mcbsp4_fck,    CK_3XXX),
+       CLK(NULL,       "emu_src_ck",   &emu_src_ck,    CK_3XXX),
        CLK("etb",      "emu_src_ck",   &emu_src_ck,    CK_3XXX),
        CLK(NULL,       "pclk_fck",     &pclk_fck,      CK_3XXX),
        CLK(NULL,       "pclkx2_fck",   &pclkx2_fck,    CK_3XXX),
@@ -3460,8 +3487,12 @@ static struct omap_clk omap3xxx_clks[] = {
        CLK(NULL,       "ipss_ick",     &ipss_ick,      CK_AM35XX),
        CLK(NULL,       "rmii_ck",      &rmii_ck,       CK_AM35XX),
        CLK(NULL,       "pclk_ck",      &pclk_ck,       CK_AM35XX),
+       CLK(NULL,       "emac_ick",     &emac_ick,      CK_AM35XX),
+       CLK(NULL,       "emac_fck",     &emac_fck,      CK_AM35XX),
        CLK("davinci_emac.0",   NULL,   &emac_ick,      CK_AM35XX),
        CLK("davinci_mdio.0",   NULL,   &emac_fck,      CK_AM35XX),
+       CLK(NULL,       "vpfe_ick",     &emac_ick,      CK_AM35XX),
+       CLK(NULL,       "vpfe_fck",     &emac_fck,      CK_AM35XX),
        CLK("vpfe-capture",     "master",       &vpfe_ick,      CK_AM35XX),
        CLK("vpfe-capture",     "slave",        &vpfe_fck,      CK_AM35XX),
        CLK(NULL,       "hsotgusb_ick",         &hsotgusb_ick_am35xx,   CK_AM35XX),