diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock24xx.c')
-rw-r--r-- | arch/arm/mach-omap2/clock24xx.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c index 1e839c5a28c..e4cef333e29 100644 --- a/arch/arm/mach-omap2/clock24xx.c +++ b/arch/arm/mach-omap2/clock24xx.c | |||
@@ -60,12 +60,13 @@ struct omap_clk { | |||
60 | }, \ | 60 | }, \ |
61 | } | 61 | } |
62 | 62 | ||
63 | #define CK_243X (1 << 0) | 63 | #define CK_243X RATE_IN_243X |
64 | #define CK_242X (1 << 1) | 64 | #define CK_242X RATE_IN_242X |
65 | 65 | ||
66 | static struct omap_clk omap24xx_clks[] = { | 66 | static struct omap_clk omap24xx_clks[] = { |
67 | /* external root sources */ | 67 | /* external root sources */ |
68 | CLK(NULL, "func_32k_ck", &func_32k_ck, CK_243X | CK_242X), | 68 | CLK(NULL, "func_32k_ck", &func_32k_ck, CK_243X | CK_242X), |
69 | CLK(NULL, "secure_32k_ck", &secure_32k_ck, CK_243X | CK_242X), | ||
69 | CLK(NULL, "osc_ck", &osc_ck, CK_243X | CK_242X), | 70 | CLK(NULL, "osc_ck", &osc_ck, CK_243X | CK_242X), |
70 | CLK(NULL, "sys_ck", &sys_ck, CK_243X | CK_242X), | 71 | CLK(NULL, "sys_ck", &sys_ck, CK_243X | CK_242X), |
71 | CLK(NULL, "alt_ck", &alt_ck, CK_243X | CK_242X), | 72 | CLK(NULL, "alt_ck", &alt_ck, CK_243X | CK_242X), |
@@ -102,10 +103,10 @@ static struct omap_clk omap24xx_clks[] = { | |||
102 | CLK(NULL, "mdm_ick", &mdm_ick, CK_243X), | 103 | CLK(NULL, "mdm_ick", &mdm_ick, CK_243X), |
103 | CLK(NULL, "mdm_osc_ck", &mdm_osc_ck, CK_243X), | 104 | CLK(NULL, "mdm_osc_ck", &mdm_osc_ck, CK_243X), |
104 | /* DSS domain clocks */ | 105 | /* DSS domain clocks */ |
105 | CLK(NULL, "dss_ick", &dss_ick, CK_243X | CK_242X), | 106 | CLK("omapfb", "ick", &dss_ick, CK_243X | CK_242X), |
106 | CLK(NULL, "dss1_fck", &dss1_fck, CK_243X | CK_242X), | 107 | CLK("omapfb", "dss1_fck", &dss1_fck, CK_243X | CK_242X), |
107 | CLK(NULL, "dss2_fck", &dss2_fck, CK_243X | CK_242X), | 108 | CLK("omapfb", "dss2_fck", &dss2_fck, CK_243X | CK_242X), |
108 | CLK(NULL, "dss_54m_fck", &dss_54m_fck, CK_243X | CK_242X), | 109 | CLK("omapfb", "tv_fck", &dss_54m_fck, CK_243X | CK_242X), |
109 | /* L3 domain clocks */ | 110 | /* L3 domain clocks */ |
110 | CLK(NULL, "core_l3_ck", &core_l3_ck, CK_243X | CK_242X), | 111 | CLK(NULL, "core_l3_ck", &core_l3_ck, CK_243X | CK_242X), |
111 | CLK(NULL, "ssi_fck", &ssi_ssr_sst_fck, CK_243X | CK_242X), | 112 | CLK(NULL, "ssi_fck", &ssi_ssr_sst_fck, CK_243X | CK_242X), |
@@ -205,7 +206,7 @@ static struct omap_clk omap24xx_clks[] = { | |||
205 | CLK(NULL, "aes_ick", &aes_ick, CK_243X | CK_242X), | 206 | CLK(NULL, "aes_ick", &aes_ick, CK_243X | CK_242X), |
206 | CLK(NULL, "pka_ick", &pka_ick, CK_243X | CK_242X), | 207 | CLK(NULL, "pka_ick", &pka_ick, CK_243X | CK_242X), |
207 | CLK(NULL, "usb_fck", &usb_fck, CK_243X | CK_242X), | 208 | CLK(NULL, "usb_fck", &usb_fck, CK_243X | CK_242X), |
208 | CLK(NULL, "usbhs_ick", &usbhs_ick, CK_243X), | 209 | CLK("musb_hdrc", "ick", &usbhs_ick, CK_243X), |
209 | CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_243X), | 210 | CLK("mmci-omap-hs.0", "ick", &mmchs1_ick, CK_243X), |
210 | CLK("mmci-omap-hs.0", "fck", &mmchs1_fck, CK_243X), | 211 | CLK("mmci-omap-hs.0", "fck", &mmchs1_fck, CK_243X), |
211 | CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_243X), | 212 | CLK("mmci-omap-hs.1", "ick", &mmchs2_ick, CK_243X), |
@@ -711,7 +712,7 @@ int __init omap2_clk_init(void) | |||
711 | { | 712 | { |
712 | struct prcm_config *prcm; | 713 | struct prcm_config *prcm; |
713 | struct omap_clk *c; | 714 | struct omap_clk *c; |
714 | u32 clkrate, cpu_mask; | 715 | u32 clkrate; |
715 | 716 | ||
716 | if (cpu_is_omap242x()) | 717 | if (cpu_is_omap242x()) |
717 | cpu_mask = RATE_IN_242X; | 718 | cpu_mask = RATE_IN_242X; |
@@ -720,21 +721,15 @@ int __init omap2_clk_init(void) | |||
720 | 721 | ||
721 | clk_init(&omap2_clk_functions); | 722 | clk_init(&omap2_clk_functions); |
722 | 723 | ||
724 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) | ||
725 | clk_init_one(c->lk.clk); | ||
726 | |||
723 | osc_ck.rate = omap2_osc_clk_recalc(&osc_ck); | 727 | osc_ck.rate = omap2_osc_clk_recalc(&osc_ck); |
724 | propagate_rate(&osc_ck); | 728 | propagate_rate(&osc_ck); |
725 | sys_ck.rate = omap2_sys_clk_recalc(&sys_ck); | 729 | sys_ck.rate = omap2_sys_clk_recalc(&sys_ck); |
726 | propagate_rate(&sys_ck); | 730 | propagate_rate(&sys_ck); |
727 | 731 | ||
728 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) | 732 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) |
729 | clk_init_one(c->lk.clk); | ||
730 | |||
731 | cpu_mask = 0; | ||
732 | if (cpu_is_omap2420()) | ||
733 | cpu_mask |= CK_242X; | ||
734 | if (cpu_is_omap2430()) | ||
735 | cpu_mask |= CK_243X; | ||
736 | |||
737 | for (c = omap24xx_clks; c < omap24xx_clks + ARRAY_SIZE(omap24xx_clks); c++) | ||
738 | if (c->cpu & cpu_mask) { | 733 | if (c->cpu & cpu_mask) { |
739 | clkdev_add(&c->lk); | 734 | clkdev_add(&c->lk); |
740 | clk_register(c->lk.clk); | 735 | clk_register(c->lk.clk); |