]> Pileus Git - ~andy/linux/blobdiff - arch/arm/mach-omap2/cclock2420_data.c
rcu: Simplify RCU_STATE_INITIALIZER() macro
[~andy/linux] / arch / arm / mach-omap2 / cclock2420_data.c
index 0f0a97c1fcc072b73fc7754d2503408f99c9030f..3662f4d4c8eac876b5b951f045f105bec0ce438a 100644 (file)
@@ -1739,153 +1739,153 @@ DEFINE_STRUCT_CLK(wdt4_ick, aes_ick_parent_names, aes_ick_ops);
 
 static struct omap_clk omap2420_clks[] = {
        /* external root sources */
-       CLK(NULL,       "func_32k_ck",  &func_32k_ck,   CK_242X),
-       CLK(NULL,       "secure_32k_ck", &secure_32k_ck, CK_242X),
-       CLK(NULL,       "osc_ck",       &osc_ck,        CK_242X),
-       CLK(NULL,       "sys_ck",       &sys_ck,        CK_242X),
-       CLK(NULL,       "alt_ck",       &alt_ck,        CK_242X),
-       CLK(NULL,       "mcbsp_clks",   &mcbsp_clks,    CK_242X),
+       CLK(NULL,       "func_32k_ck",  &func_32k_ck),
+       CLK(NULL,       "secure_32k_ck", &secure_32k_ck),
+       CLK(NULL,       "osc_ck",       &osc_ck),
+       CLK(NULL,       "sys_ck",       &sys_ck),
+       CLK(NULL,       "alt_ck",       &alt_ck),
+       CLK(NULL,       "mcbsp_clks",   &mcbsp_clks),
        /* internal analog sources */
-       CLK(NULL,       "dpll_ck",      &dpll_ck,       CK_242X),
-       CLK(NULL,       "apll96_ck",    &apll96_ck,     CK_242X),
-       CLK(NULL,       "apll54_ck",    &apll54_ck,     CK_242X),
+       CLK(NULL,       "dpll_ck",      &dpll_ck),
+       CLK(NULL,       "apll96_ck",    &apll96_ck),
+       CLK(NULL,       "apll54_ck",    &apll54_ck),
        /* internal prcm root sources */
-       CLK(NULL,       "func_54m_ck",  &func_54m_ck,   CK_242X),
-       CLK(NULL,       "core_ck",      &core_ck,       CK_242X),
-       CLK(NULL,       "func_96m_ck",  &func_96m_ck,   CK_242X),
-       CLK(NULL,       "func_48m_ck",  &func_48m_ck,   CK_242X),
-       CLK(NULL,       "func_12m_ck",  &func_12m_ck,   CK_242X),
-       CLK(NULL,       "sys_clkout_src", &sys_clkout_src, CK_242X),
-       CLK(NULL,       "sys_clkout",   &sys_clkout,    CK_242X),
-       CLK(NULL,       "sys_clkout2_src", &sys_clkout2_src, CK_242X),
-       CLK(NULL,       "sys_clkout2",  &sys_clkout2,   CK_242X),
-       CLK(NULL,       "emul_ck",      &emul_ck,       CK_242X),
+       CLK(NULL,       "func_54m_ck",  &func_54m_ck),
+       CLK(NULL,       "core_ck",      &core_ck),
+       CLK(NULL,       "func_96m_ck",  &func_96m_ck),
+       CLK(NULL,       "func_48m_ck",  &func_48m_ck),
+       CLK(NULL,       "func_12m_ck",  &func_12m_ck),
+       CLK(NULL,       "sys_clkout_src", &sys_clkout_src),
+       CLK(NULL,       "sys_clkout",   &sys_clkout),
+       CLK(NULL,       "sys_clkout2_src", &sys_clkout2_src),
+       CLK(NULL,       "sys_clkout2",  &sys_clkout2),
+       CLK(NULL,       "emul_ck",      &emul_ck),
        /* mpu domain clocks */
-       CLK(NULL,       "mpu_ck",       &mpu_ck,        CK_242X),
+       CLK(NULL,       "mpu_ck",       &mpu_ck),
        /* dsp domain clocks */
-       CLK(NULL,       "dsp_fck",      &dsp_fck,       CK_242X),
-       CLK(NULL,       "dsp_ick",      &dsp_ick,       CK_242X),
-       CLK(NULL,       "iva1_ifck",    &iva1_ifck,     CK_242X),
-       CLK(NULL,       "iva1_mpu_int_ifck", &iva1_mpu_int_ifck, CK_242X),
+       CLK(NULL,       "dsp_fck",      &dsp_fck),
+       CLK(NULL,       "dsp_ick",      &dsp_ick),
+       CLK(NULL,       "iva1_ifck",    &iva1_ifck),
+       CLK(NULL,       "iva1_mpu_int_ifck", &iva1_mpu_int_ifck),
        /* GFX domain clocks */
-       CLK(NULL,       "gfx_3d_fck",   &gfx_3d_fck,    CK_242X),
-       CLK(NULL,       "gfx_2d_fck",   &gfx_2d_fck,    CK_242X),
-       CLK(NULL,       "gfx_ick",      &gfx_ick,       CK_242X),
+       CLK(NULL,       "gfx_3d_fck",   &gfx_3d_fck),
+       CLK(NULL,       "gfx_2d_fck",   &gfx_2d_fck),
+       CLK(NULL,       "gfx_ick",      &gfx_ick),
        /* DSS domain clocks */
-       CLK("omapdss_dss",      "ick",          &dss_ick,       CK_242X),
-       CLK(NULL,       "dss_ick",              &dss_ick,       CK_242X),
-       CLK(NULL,       "dss1_fck",             &dss1_fck,      CK_242X),
-       CLK(NULL,       "dss2_fck",     &dss2_fck,      CK_242X),
-       CLK(NULL,       "dss_54m_fck",  &dss_54m_fck,   CK_242X),
+       CLK("omapdss_dss",      "ick",          &dss_ick),
+       CLK(NULL,       "dss_ick",              &dss_ick),
+       CLK(NULL,       "dss1_fck",             &dss1_fck),
+       CLK(NULL,       "dss2_fck",     &dss2_fck),
+       CLK(NULL,       "dss_54m_fck",  &dss_54m_fck),
        /* L3 domain clocks */
-       CLK(NULL,       "core_l3_ck",   &core_l3_ck,    CK_242X),
-       CLK(NULL,       "ssi_fck",      &ssi_ssr_sst_fck, CK_242X),
-       CLK(NULL,       "usb_l4_ick",   &usb_l4_ick,    CK_242X),
+       CLK(NULL,       "core_l3_ck",   &core_l3_ck),
+       CLK(NULL,       "ssi_fck",      &ssi_ssr_sst_fck),
+       CLK(NULL,       "usb_l4_ick",   &usb_l4_ick),
        /* L4 domain clocks */
-       CLK(NULL,       "l4_ck",        &l4_ck,         CK_242X),
-       CLK(NULL,       "ssi_l4_ick",   &ssi_l4_ick,    CK_242X),
+       CLK(NULL,       "l4_ck",        &l4_ck),
+       CLK(NULL,       "ssi_l4_ick",   &ssi_l4_ick),
        /* virtual meta-group clock */
-       CLK(NULL,       "virt_prcm_set", &virt_prcm_set, CK_242X),
+       CLK(NULL,       "virt_prcm_set", &virt_prcm_set),
        /* general l4 interface ck, multi-parent functional clk */
-       CLK(NULL,       "gpt1_ick",     &gpt1_ick,      CK_242X),
-       CLK(NULL,       "gpt1_fck",     &gpt1_fck,      CK_242X),
-       CLK(NULL,       "gpt2_ick",     &gpt2_ick,      CK_242X),
-       CLK(NULL,       "gpt2_fck",     &gpt2_fck,      CK_242X),
-       CLK(NULL,       "gpt3_ick",     &gpt3_ick,      CK_242X),
-       CLK(NULL,       "gpt3_fck",     &gpt3_fck,      CK_242X),
-       CLK(NULL,       "gpt4_ick",     &gpt4_ick,      CK_242X),
-       CLK(NULL,       "gpt4_fck",     &gpt4_fck,      CK_242X),
-       CLK(NULL,       "gpt5_ick",     &gpt5_ick,      CK_242X),
-       CLK(NULL,       "gpt5_fck",     &gpt5_fck,      CK_242X),
-       CLK(NULL,       "gpt6_ick",     &gpt6_ick,      CK_242X),
-       CLK(NULL,       "gpt6_fck",     &gpt6_fck,      CK_242X),
-       CLK(NULL,       "gpt7_ick",     &gpt7_ick,      CK_242X),
-       CLK(NULL,       "gpt7_fck",     &gpt7_fck,      CK_242X),
-       CLK(NULL,       "gpt8_ick",     &gpt8_ick,      CK_242X),
-       CLK(NULL,       "gpt8_fck",     &gpt8_fck,      CK_242X),
-       CLK(NULL,       "gpt9_ick",     &gpt9_ick,      CK_242X),
-       CLK(NULL,       "gpt9_fck",     &gpt9_fck,      CK_242X),
-       CLK(NULL,       "gpt10_ick",    &gpt10_ick,     CK_242X),
-       CLK(NULL,       "gpt10_fck",    &gpt10_fck,     CK_242X),
-       CLK(NULL,       "gpt11_ick",    &gpt11_ick,     CK_242X),
-       CLK(NULL,       "gpt11_fck",    &gpt11_fck,     CK_242X),
-       CLK(NULL,       "gpt12_ick",    &gpt12_ick,     CK_242X),
-       CLK(NULL,       "gpt12_fck",    &gpt12_fck,     CK_242X),
-       CLK("omap-mcbsp.1", "ick",      &mcbsp1_ick,    CK_242X),
-       CLK(NULL,       "mcbsp1_ick",   &mcbsp1_ick,    CK_242X),
-       CLK(NULL,       "mcbsp1_fck",   &mcbsp1_fck,    CK_242X),
-       CLK("omap-mcbsp.2", "ick",      &mcbsp2_ick,    CK_242X),
-       CLK(NULL,       "mcbsp2_ick",   &mcbsp2_ick,    CK_242X),
-       CLK(NULL,       "mcbsp2_fck",   &mcbsp2_fck,    CK_242X),
-       CLK("omap2_mcspi.1", "ick",     &mcspi1_ick,    CK_242X),
-       CLK(NULL,       "mcspi1_ick",   &mcspi1_ick,    CK_242X),
-       CLK(NULL,       "mcspi1_fck",   &mcspi1_fck,    CK_242X),
-       CLK("omap2_mcspi.2", "ick",     &mcspi2_ick,    CK_242X),
-       CLK(NULL,       "mcspi2_ick",   &mcspi2_ick,    CK_242X),
-       CLK(NULL,       "mcspi2_fck",   &mcspi2_fck,    CK_242X),
-       CLK(NULL,       "uart1_ick",    &uart1_ick,     CK_242X),
-       CLK(NULL,       "uart1_fck",    &uart1_fck,     CK_242X),
-       CLK(NULL,       "uart2_ick",    &uart2_ick,     CK_242X),
-       CLK(NULL,       "uart2_fck",    &uart2_fck,     CK_242X),
-       CLK(NULL,       "uart3_ick",    &uart3_ick,     CK_242X),
-       CLK(NULL,       "uart3_fck",    &uart3_fck,     CK_242X),
-       CLK(NULL,       "gpios_ick",    &gpios_ick,     CK_242X),
-       CLK(NULL,       "gpios_fck",    &gpios_fck,     CK_242X),
-       CLK("omap_wdt", "ick",          &mpu_wdt_ick,   CK_242X),
-       CLK(NULL,       "mpu_wdt_ick",          &mpu_wdt_ick,   CK_242X),
-       CLK(NULL,       "mpu_wdt_fck",  &mpu_wdt_fck,   CK_242X),
-       CLK(NULL,       "sync_32k_ick", &sync_32k_ick,  CK_242X),
-       CLK(NULL,       "wdt1_ick",     &wdt1_ick,      CK_242X),
-       CLK(NULL,       "omapctrl_ick", &omapctrl_ick,  CK_242X),
-       CLK("omap24xxcam", "fck",       &cam_fck,       CK_242X),
-       CLK(NULL,       "cam_fck",      &cam_fck,       CK_242X),
-       CLK("omap24xxcam", "ick",       &cam_ick,       CK_242X),
-       CLK(NULL,       "cam_ick",      &cam_ick,       CK_242X),
-       CLK(NULL,       "mailboxes_ick", &mailboxes_ick,        CK_242X),
-       CLK(NULL,       "wdt4_ick",     &wdt4_ick,      CK_242X),
-       CLK(NULL,       "wdt4_fck",     &wdt4_fck,      CK_242X),
-       CLK(NULL,       "wdt3_ick",     &wdt3_ick,      CK_242X),
-       CLK(NULL,       "wdt3_fck",     &wdt3_fck,      CK_242X),
-       CLK(NULL,       "mspro_ick",    &mspro_ick,     CK_242X),
-       CLK(NULL,       "mspro_fck",    &mspro_fck,     CK_242X),
-       CLK("mmci-omap.0", "ick",       &mmc_ick,       CK_242X),
-       CLK(NULL,       "mmc_ick",      &mmc_ick,       CK_242X),
-       CLK("mmci-omap.0", "fck",       &mmc_fck,       CK_242X),
-       CLK(NULL,       "mmc_fck",      &mmc_fck,       CK_242X),
-       CLK(NULL,       "fac_ick",      &fac_ick,       CK_242X),
-       CLK(NULL,       "fac_fck",      &fac_fck,       CK_242X),
-       CLK(NULL,       "eac_ick",      &eac_ick,       CK_242X),
-       CLK(NULL,       "eac_fck",      &eac_fck,       CK_242X),
-       CLK("omap_hdq.0", "ick",        &hdq_ick,       CK_242X),
-       CLK(NULL,       "hdq_ick",      &hdq_ick,       CK_242X),
-       CLK("omap_hdq.0", "fck",        &hdq_fck,       CK_242X),
-       CLK(NULL,       "hdq_fck",      &hdq_fck,       CK_242X),
-       CLK("omap_i2c.1", "ick",        &i2c1_ick,      CK_242X),
-       CLK(NULL,       "i2c1_ick",     &i2c1_ick,      CK_242X),
-       CLK(NULL,       "i2c1_fck",     &i2c1_fck,      CK_242X),
-       CLK("omap_i2c.2", "ick",        &i2c2_ick,      CK_242X),
-       CLK(NULL,       "i2c2_ick",     &i2c2_ick,      CK_242X),
-       CLK(NULL,       "i2c2_fck",     &i2c2_fck,      CK_242X),
-       CLK(NULL,       "gpmc_fck",     &gpmc_fck,      CK_242X),
-       CLK(NULL,       "sdma_fck",     &sdma_fck,      CK_242X),
-       CLK(NULL,       "sdma_ick",     &sdma_ick,      CK_242X),
-       CLK(NULL,       "sdrc_ick",     &sdrc_ick,      CK_242X),
-       CLK(NULL,       "vlynq_ick",    &vlynq_ick,     CK_242X),
-       CLK(NULL,       "vlynq_fck",    &vlynq_fck,     CK_242X),
-       CLK(NULL,       "des_ick",      &des_ick,       CK_242X),
-       CLK("omap-sham",        "ick",  &sha_ick,       CK_242X),
-       CLK(NULL,       "sha_ick",      &sha_ick,       CK_242X),
-       CLK("omap_rng", "ick",          &rng_ick,       CK_242X),
-       CLK(NULL,       "rng_ick",              &rng_ick,       CK_242X),
-       CLK("omap-aes", "ick",  &aes_ick,       CK_242X),
-       CLK(NULL,       "aes_ick",      &aes_ick,       CK_242X),
-       CLK(NULL,       "pka_ick",      &pka_ick,       CK_242X),
-       CLK(NULL,       "usb_fck",      &usb_fck,       CK_242X),
-       CLK("musb-hdrc",        "fck",  &osc_ck,        CK_242X),
-       CLK(NULL,       "timer_32k_ck", &func_32k_ck,   CK_242X),
-       CLK(NULL,       "timer_sys_ck", &sys_ck,        CK_242X),
-       CLK(NULL,       "timer_ext_ck", &alt_ck,        CK_242X),
-       CLK(NULL,       "cpufreq_ck",   &virt_prcm_set, CK_242X),
+       CLK(NULL,       "gpt1_ick",     &gpt1_ick),
+       CLK(NULL,       "gpt1_fck",     &gpt1_fck),
+       CLK(NULL,       "gpt2_ick",     &gpt2_ick),
+       CLK(NULL,       "gpt2_fck",     &gpt2_fck),
+       CLK(NULL,       "gpt3_ick",     &gpt3_ick),
+       CLK(NULL,       "gpt3_fck",     &gpt3_fck),
+       CLK(NULL,       "gpt4_ick",     &gpt4_ick),
+       CLK(NULL,       "gpt4_fck",     &gpt4_fck),
+       CLK(NULL,       "gpt5_ick",     &gpt5_ick),
+       CLK(NULL,       "gpt5_fck",     &gpt5_fck),
+       CLK(NULL,       "gpt6_ick",     &gpt6_ick),
+       CLK(NULL,       "gpt6_fck",     &gpt6_fck),
+       CLK(NULL,       "gpt7_ick",     &gpt7_ick),
+       CLK(NULL,       "gpt7_fck",     &gpt7_fck),
+       CLK(NULL,       "gpt8_ick",     &gpt8_ick),
+       CLK(NULL,       "gpt8_fck",     &gpt8_fck),
+       CLK(NULL,       "gpt9_ick",     &gpt9_ick),
+       CLK(NULL,       "gpt9_fck",     &gpt9_fck),
+       CLK(NULL,       "gpt10_ick",    &gpt10_ick),
+       CLK(NULL,       "gpt10_fck",    &gpt10_fck),
+       CLK(NULL,       "gpt11_ick",    &gpt11_ick),
+       CLK(NULL,       "gpt11_fck",    &gpt11_fck),
+       CLK(NULL,       "gpt12_ick",    &gpt12_ick),
+       CLK(NULL,       "gpt12_fck",    &gpt12_fck),
+       CLK("omap-mcbsp.1", "ick",      &mcbsp1_ick),
+       CLK(NULL,       "mcbsp1_ick",   &mcbsp1_ick),
+       CLK(NULL,       "mcbsp1_fck",   &mcbsp1_fck),
+       CLK("omap-mcbsp.2", "ick",      &mcbsp2_ick),
+       CLK(NULL,       "mcbsp2_ick",   &mcbsp2_ick),
+       CLK(NULL,       "mcbsp2_fck",   &mcbsp2_fck),
+       CLK("omap2_mcspi.1", "ick",     &mcspi1_ick),
+       CLK(NULL,       "mcspi1_ick",   &mcspi1_ick),
+       CLK(NULL,       "mcspi1_fck",   &mcspi1_fck),
+       CLK("omap2_mcspi.2", "ick",     &mcspi2_ick),
+       CLK(NULL,       "mcspi2_ick",   &mcspi2_ick),
+       CLK(NULL,       "mcspi2_fck",   &mcspi2_fck),
+       CLK(NULL,       "uart1_ick",    &uart1_ick),
+       CLK(NULL,       "uart1_fck",    &uart1_fck),
+       CLK(NULL,       "uart2_ick",    &uart2_ick),
+       CLK(NULL,       "uart2_fck",    &uart2_fck),
+       CLK(NULL,       "uart3_ick",    &uart3_ick),
+       CLK(NULL,       "uart3_fck",    &uart3_fck),
+       CLK(NULL,       "gpios_ick",    &gpios_ick),
+       CLK(NULL,       "gpios_fck",    &gpios_fck),
+       CLK("omap_wdt", "ick",          &mpu_wdt_ick),
+       CLK(NULL,       "mpu_wdt_ick",          &mpu_wdt_ick),
+       CLK(NULL,       "mpu_wdt_fck",  &mpu_wdt_fck),
+       CLK(NULL,       "sync_32k_ick", &sync_32k_ick),
+       CLK(NULL,       "wdt1_ick",     &wdt1_ick),
+       CLK(NULL,       "omapctrl_ick", &omapctrl_ick),
+       CLK("omap24xxcam", "fck",       &cam_fck),
+       CLK(NULL,       "cam_fck",      &cam_fck),
+       CLK("omap24xxcam", "ick",       &cam_ick),
+       CLK(NULL,       "cam_ick",      &cam_ick),
+       CLK(NULL,       "mailboxes_ick", &mailboxes_ick),
+       CLK(NULL,       "wdt4_ick",     &wdt4_ick),
+       CLK(NULL,       "wdt4_fck",     &wdt4_fck),
+       CLK(NULL,       "wdt3_ick",     &wdt3_ick),
+       CLK(NULL,       "wdt3_fck",     &wdt3_fck),
+       CLK(NULL,       "mspro_ick",    &mspro_ick),
+       CLK(NULL,       "mspro_fck",    &mspro_fck),
+       CLK("mmci-omap.0", "ick",       &mmc_ick),
+       CLK(NULL,       "mmc_ick",      &mmc_ick),
+       CLK("mmci-omap.0", "fck",       &mmc_fck),
+       CLK(NULL,       "mmc_fck",      &mmc_fck),
+       CLK(NULL,       "fac_ick",      &fac_ick),
+       CLK(NULL,       "fac_fck",      &fac_fck),
+       CLK(NULL,       "eac_ick",      &eac_ick),
+       CLK(NULL,       "eac_fck",      &eac_fck),
+       CLK("omap_hdq.0", "ick",        &hdq_ick),
+       CLK(NULL,       "hdq_ick",      &hdq_ick),
+       CLK("omap_hdq.0", "fck",        &hdq_fck),
+       CLK(NULL,       "hdq_fck",      &hdq_fck),
+       CLK("omap_i2c.1", "ick",        &i2c1_ick),
+       CLK(NULL,       "i2c1_ick",     &i2c1_ick),
+       CLK(NULL,       "i2c1_fck",     &i2c1_fck),
+       CLK("omap_i2c.2", "ick",        &i2c2_ick),
+       CLK(NULL,       "i2c2_ick",     &i2c2_ick),
+       CLK(NULL,       "i2c2_fck",     &i2c2_fck),
+       CLK(NULL,       "gpmc_fck",     &gpmc_fck),
+       CLK(NULL,       "sdma_fck",     &sdma_fck),
+       CLK(NULL,       "sdma_ick",     &sdma_ick),
+       CLK(NULL,       "sdrc_ick",     &sdrc_ick),
+       CLK(NULL,       "vlynq_ick",    &vlynq_ick),
+       CLK(NULL,       "vlynq_fck",    &vlynq_fck),
+       CLK(NULL,       "des_ick",      &des_ick),
+       CLK("omap-sham",        "ick",  &sha_ick),
+       CLK(NULL,       "sha_ick",      &sha_ick),
+       CLK("omap_rng", "ick",          &rng_ick),
+       CLK(NULL,       "rng_ick",              &rng_ick),
+       CLK("omap-aes", "ick",  &aes_ick),
+       CLK(NULL,       "aes_ick",      &aes_ick),
+       CLK(NULL,       "pka_ick",      &pka_ick),
+       CLK(NULL,       "usb_fck",      &usb_fck),
+       CLK("musb-hdrc",        "fck",  &osc_ck),
+       CLK(NULL,       "timer_32k_ck", &func_32k_ck),
+       CLK(NULL,       "timer_sys_ck", &sys_ck),
+       CLK(NULL,       "timer_ext_ck", &alt_ck),
+       CLK(NULL,       "cpufreq_ck",   &virt_prcm_set),
 };
 
 
@@ -1904,8 +1904,6 @@ static const char *enable_init_clks[] = {
 
 int __init omap2420_clk_init(void)
 {
-       struct omap_clk *c;
-
        prcm_clksrc_ctrl = OMAP2420_PRCM_CLKSRC_CTRL;
        cpu_mask = RATE_IN_242X;
        rate_table = omap2420_rate_table;
@@ -1914,12 +1912,7 @@ int __init omap2420_clk_init(void)
 
        omap2xxx_clkt_vps_check_bootloader_rates();
 
-       for (c = omap2420_clks; c < omap2420_clks + ARRAY_SIZE(omap2420_clks);
-            c++) {
-               clkdev_add(&c->lk);
-               if (!__clk_init(NULL, c->lk.clk))
-                       omap2_init_clk_hw_omap_clocks(c->lk.clk);
-       }
+       omap_clocks_register(omap2420_clks, ARRAY_SIZE(omap2420_clks));
 
        omap2xxx_clkt_vps_late_init();