diff options
Diffstat (limited to 'arch/arm/mach-omap2/clock34xx.h')
-rw-r--r-- | arch/arm/mach-omap2/clock34xx.h | 35 |
1 files changed, 33 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/clock34xx.h b/arch/arm/mach-omap2/clock34xx.h index 017a30e9aa1d..e433aec4efdd 100644 --- a/arch/arm/mach-omap2/clock34xx.h +++ b/arch/arm/mach-omap2/clock34xx.h | |||
@@ -27,6 +27,8 @@ | |||
27 | #include "prm.h" | 27 | #include "prm.h" |
28 | #include "prm-regbits-34xx.h" | 28 | #include "prm-regbits-34xx.h" |
29 | 29 | ||
30 | #define OMAP_CM_REGADDR OMAP34XX_CM_REGADDR | ||
31 | |||
30 | static unsigned long omap3_dpll_recalc(struct clk *clk); | 32 | static unsigned long omap3_dpll_recalc(struct clk *clk); |
31 | static unsigned long omap3_clkoutx2_recalc(struct clk *clk); | 33 | static unsigned long omap3_clkoutx2_recalc(struct clk *clk); |
32 | static void omap3_dpll_allow_idle(struct clk *clk); | 34 | static void omap3_dpll_allow_idle(struct clk *clk); |
@@ -1228,6 +1230,37 @@ static struct clk d2d_26m_fck = { | |||
1228 | .recalc = &followparent_recalc, | 1230 | .recalc = &followparent_recalc, |
1229 | }; | 1231 | }; |
1230 | 1232 | ||
1233 | static struct clk modem_fck = { | ||
1234 | .name = "modem_fck", | ||
1235 | .ops = &clkops_omap2_dflt_wait, | ||
1236 | .parent = &sys_ck, | ||
1237 | .init = &omap2_init_clk_clkdm, | ||
1238 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_FCLKEN1), | ||
1239 | .enable_bit = OMAP3430_EN_MODEM_SHIFT, | ||
1240 | .clkdm_name = "d2d_clkdm", | ||
1241 | .recalc = &followparent_recalc, | ||
1242 | }; | ||
1243 | |||
1244 | static struct clk sad2d_ick = { | ||
1245 | .name = "sad2d_ick", | ||
1246 | .ops = &clkops_omap2_dflt_wait, | ||
1247 | .parent = &l3_ick, | ||
1248 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN1), | ||
1249 | .enable_bit = OMAP3430_EN_SAD2D_SHIFT, | ||
1250 | .clkdm_name = "d2d_clkdm", | ||
1251 | .recalc = &followparent_recalc, | ||
1252 | }; | ||
1253 | |||
1254 | static struct clk mad2d_ick = { | ||
1255 | .name = "mad2d_ick", | ||
1256 | .ops = &clkops_omap2_dflt_wait, | ||
1257 | .parent = &l3_ick, | ||
1258 | .enable_reg = OMAP_CM_REGADDR(CORE_MOD, CM_ICLKEN3), | ||
1259 | .enable_bit = OMAP3430_EN_MAD2D_SHIFT, | ||
1260 | .clkdm_name = "d2d_clkdm", | ||
1261 | .recalc = &followparent_recalc, | ||
1262 | }; | ||
1263 | |||
1231 | static const struct clksel omap343x_gpt_clksel[] = { | 1264 | static const struct clksel omap343x_gpt_clksel[] = { |
1232 | { .parent = &omap_32k_fck, .rates = gpt_32k_rates }, | 1265 | { .parent = &omap_32k_fck, .rates = gpt_32k_rates }, |
1233 | { .parent = &sys_ck, .rates = gpt_sys_rates }, | 1266 | { .parent = &sys_ck, .rates = gpt_sys_rates }, |
@@ -1945,8 +1978,6 @@ static struct clk usb_l4_ick = { | |||
1945 | .recalc = &omap2_clksel_recalc, | 1978 | .recalc = &omap2_clksel_recalc, |
1946 | }; | 1979 | }; |
1947 | 1980 | ||
1948 | /* XXX MDM_INTC_ICK, SAD2D_ICK ?? */ | ||
1949 | |||
1950 | /* SECURITY_L4_ICK2 based clocks */ | 1981 | /* SECURITY_L4_ICK2 based clocks */ |
1951 | 1982 | ||
1952 | static struct clk security_l4_ick2 = { | 1983 | static struct clk security_l4_ick2 = { |