OMAP3: introduce DPLL4 Jtype
cover OMAP3: introduce DPLL4 Jtype
The patchset introduces jtype DPLLs which as a first stage introduces it for 3630. 3430 has a previous version of DPLL and process changes in 3630 neccessitates this for DPLL4
Patchset has been created for linux-omap - tmlind tree
Nishanth Menon (1):
OMAP3: move check_revision above check_features
Richard Woodruff (1):
OMAP3:clk - introduce DPLL4 jtype support
arch/arm/mach-omap2/clock34xx.c | 45 ++++++++++++++++++++++++++++++- arch/arm/mach-omap2/cm-regbits-34xx.h | 6 +++- arch/arm/mach-omap2/id.c | 5 +++- arch/arm/plat-omap/include/plat/clock.h | 3 ++ arch/arm/plat-omap/include/plat/cpu.h | 2 + 5 files changed, 58 insertions(+), 3 deletions(-)
Regards,
Nishanth Menon
PATCH 1/2 OMAP3: move check_revision above check_features
omap3_check_revision() does not depend on omap3_check_features() move this above so that we can add logic based on revision detected in check_features.
--- arch/arm/mach-omap2/id.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/mach-omap2/id.c +1 -1
@@ -328,8 +328,8 @@ void __init omap2_check_revision(void)if (cpu_is_omap24xx ())omap24xx_check_revision ();else if (cpu_is_omap34xx ()) { -omap3_check_features ();omap3_check_revision (); +omap3_check_features ();omap3_cpuinfo (); }else if (cpu_is_omap44xx ()) {
Signature · 1 line
1.6.3.3
PATCH 2/2 OMAP3:clk: introduce DPLL4 jtype support
From: Richard Woodruff <[email protected]>
DPLL4 for 3630 introduces a changed block requiring special divisor bits and additional reg fields
To allow for silicons to use this, this is introduced as a omap3_has_jtype_dpll4() and is enabled for 3630 silicon
Tested with SDP3430, SDP3630
--- arch/arm/mach-omap2/clock34xx.c | 45 ++++++++++++++++++++++++++++++- arch/arm/mach-omap2/cm-regbits-34xx.h | 6 +++- arch/arm/mach-omap2/id.c | 3 ++ arch/arm/plat-omap/include/plat/clock.h | 3 ++ arch/arm/plat-omap/include/plat/cpu.h | 2 + 5 files changed, 57 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/clock34xx.c +44 -1
@@ -675,6 +675,40 @@ static void omap3_noncore_dpll_disable(struct clk *clk)_omap3_noncore_dpll_stop (clk); } +/** +* lookup_dco_sddiv -j-type DPLL4 compensation variables +* @clk: pointer to a DPLL struct clk +* @dco: digital control oscillator selector +* @sd_div: target sigma-delta divider +* @m: DPLL multiplier to set +* @n: DPLL divider to set +*/ +void lookup_dco_sddiv (struct clk *clk,u8 *dco,u8 *sd_div,u16 m,u8 n) +{ +unsigned long fint, clkinp, sd;/* watch out for overflow */ +int mod1, mod2; + ++n;/* always n+1 below */ + clkinp = clk->parent->rate; + fint = (clkinp / n) * m; + +if (fint <1000000000 ) + *dco =2 ; +else + *dco =4 ; +/* +* target sigma-delta to near 250MHz +* sd = ceil[(m/(n+1)) * (clkinp_MHz / 250)] +*/ + clkinp /=100000 ;/* shift from MHz to 10*Hz for 38.4 and 19.2*/ + mod1 = (clkinp * m) % (250 * n); + sd = (clkinp * m) / (250 * n); + mod2 = sd %10 ; + sd /=10 ; + +if (mod1 + mod2) + ++sd; + *sd_div = sd; +}/* Non-CORE DPLL rate set code */
@@ -707,6 +741,13 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel) v &= ~(dd->mult_mask | dd->div1_mask); v |= m <<__ffs (dd->mult_mask); v |= (n -1 ) <<__ffs (dd->div1_mask); +if (dd->jtype) { +u8 dco, sd_div; +lookup_dco_sddiv (clk, &dco, &sd_div, m, n); + v &= ~(dd->dco_sel_mask | dd->sd_div_mask); + v |= dco <<__ffs (dd->dco_sel_mask); + v |= sd_div <<__ffs (dd->sd_div_mask); + }__raw_writel (v, dd->mult_div1_reg);/* We let the clock framework set the other output dividers later */
@@ -1022,7 +1063,7 @@ static unsigned long omap3_clkoutx2_recalc(struct clk *clk) v =__raw_readl (dd->control_reg) & dd->enable_mask; v >>=__ffs (dd->enable_mask); -if (v !=OMAP3XXX_EN_DPLL_LOCKED ) +if (v !=OMAP3XXX_EN_DPLL_LOCKED && (!dd->jtype)) rate = clk->parent->rate;else rate = clk->parent->rate *2 ;
@@ -1135,6 +1176,8 @@ int __init omap2_clk_init(void) cpu_mask |=RATE_IN_3430ES2 ; cpu_clkflg |=CK_3430ES2 ; } +if (omap3_has_jtype_dpll4 ()) + dpll4_ck.dpll_data->jtype =1 ; }clk_init (&omap2_clk_functions);
arch/arm/mach-omap2/cm-regbits-34xx.h +5 -1
@@ -516,9 +516,13 @@/* CM_CLKSEL2_PLL */ #define OMAP3430_PERIPH_DPLL_MULT_SHIFT 8 -#define OMAP3430_PERIPH_DPLL_MULT_MASK (0x7ff << 8) +#define OMAP3430_PERIPH_DPLL_MULT_MASK (0xfff << 8)#define OMAP3430_PERIPH_DPLL_DIV_SHIFT 0#define OMAP3430_PERIPH_DPLL_DIV_MASK (0x7f << 0) +#define OMAP3630_PERIPH_DPLL_DCO_SEL_SHIFT 21 +#define OMAP3630_PERIPH_DPLL_DCO_SEL_MASK (0x7 << 21) +#define OMAP3630_PERIPH_DPLL_SD_DIV_SHIFT 24 +#define OMAP3630_PERIPH_DPLL_SD_DIV_MASK (0xff << 24)/* CM_CLKSEL3_PLL */ #define OMAP3430_DIV_96M_SHIFT 0
arch/arm/mach-omap2/id.c +3 -0
@@ -176,6 +176,8 @@ void __init omap3_check_features(void)OMAP3_CHECK_FEATURE (status,NEON );OMAP3_CHECK_FEATURE (status,ISP ); +if (cpu_is_omap3630 ()) + omap3_features |=OMAP3_HAS_JTYPE_DPLL4 ;/* * TODO: Get additional info (where applicable) * e.g. Size of L2 cache.
@@ -314,6 +316,7 @@ void __init omap3_cpuinfo(void)OMAP3_SHOW_FEATURE (sgx);OMAP3_SHOW_FEATURE (neon);OMAP3_SHOW_FEATURE (isp); +OMAP3_SHOW_FEATURE (jtype_dpll4); }/*
arch/arm/plat-omap/include/plat/clock.h +3 -0
@@ -60,6 +60,9 @@ struct dpll_data {void __iomem *idlest_reg;u32 autoidle_mask;u32 freqsel_mask; +u32 dco_sel_mask; +u32 sd_div_mask; +u8 jtype;u32 idlest_mask;u8 auto_recal_bit;u8 recal_en_bit;
arch/arm/plat-omap/include/plat/cpu.h +2 -0
@@ -482,6 +482,7 @@ extern u32 omap3_features;#define OMAP3_HAS_SGX BIT(2)#define OMAP3_HAS_NEON BIT(3)#define OMAP3_HAS_ISP BIT(4) +#define OMAP3_HAS_JTYPE_DPLL4 BIT(5)#define OMAP3_HAS_FEATURE (feat,flag) \ static inline unsigned int omap3_has_ ##feat(void) \
@@ -494,5 +495,6 @@ OMAP3_HAS_FEATURE(sgx, SGX) OMAP3_HAS_FEATURE(iva, IVA) OMAP3_HAS_FEATURE(neon, NEON) OMAP3_HAS_FEATURE(isp, ISP) +OMAP3_HAS_FEATURE(jtype_dpll4, JTYPE_DPLL4)#endif
Signature · 1 line
1.6.3.3
RE: [PATCH 2/2] OMAP3:clk: introduce DPLL4 jtype support
Nishanth,
From: [email protected] [mailto:[email protected]] On Behalf Of Menon, Nishanth
Sent: Tuesday, October 20, 2009 5:49 AM
Quoted 30 lines
From: Richard Woodruff <[email protected]>
DPLL4 for 3630 introduces a changed block requiring special divisor bits and additional reg fields
To allow for silicons to use this, this is introduced as a
omap3_has_jtype_dpll4()and is enabled for 3630 siliconTested with SDP3430, SDP3630
Cc Vikram Pandita <[email protected]>Cc Sonasath, Moiz Sonasath <[email protected]>Signed-off-by Richard Woodruff <[email protected]>Signed-off-by Nishanth Menon <[email protected]>--- arch/arm/mach-omap2/clock34xx.c | 45 ++++++++++++++++++++++++++++++- arch/arm/mach-omap2/cm-regbits-34xx.h | 6 +++- arch/arm/mach-omap2/id.c | 3 ++ arch/arm/plat-omap/include/plat/clock.h | 3 ++ arch/arm/plat-omap/include/plat/cpu.h | 2 + 5 files changed, 57 insertions(+), 2 deletions(-)arch/arm/mach-omap2/clock34xx.c +0
-0
arch/arm/mach-omap2/clock34xx.c static void · line 680
Quoted 6 lines
arch/arm/mach-omap2/clock34xx.c +2
-0@@ -675,6 +675,40 @@ static void omap3_noncore_dpll_disable(struct clk *clk)_omap3_noncore_dpll_stop (clk); } +/** +* lookup_dco_sddiv -j-type DPLL4 compensation variables
Put a space before the j-type, and add better description. Doesn't clarify what it really does IMHO:
Something like:
"* lookup_dco_sddiv - Set j-type DPLL4 compensation variables"
arch/arm/mach-omap2/clock34xx.c static void omap3_noncore_dpll_disable(struct clk *clk) · line 689
Quoted 11 lines
arch/arm/mach-omap2/clock34xx.c +10
-0+* @clk: pointer to a DPLL struct clk +* @dco: digital control oscillator selector +* @sd_div: target sigma-delta divider +* @m: DPLL multiplier to set +* @n: DPLL divider to set +*/ +void lookup_dco_sddiv (struct clk *clk,u8 *dco,u8 *sd_div,u16 m,u8 n) +{ +unsigned long fint, clkinp, sd;/* watch out for overflow */ +int mod1, mod2;
Add Space after var declarations.
Declare function as static.
Should you do something like:
BUG_ON(!clk->parent);
? (not sure)
What do you think?
Regards,
Sergio
Quoted 149 lines
arch/arm/mach-omap2/clock34xx.c +22
-0+ ++n;/* always n+1 below */ + clkinp = clk->parent->rate; + fint = (clkinp / n) * m; + +if (fint <1000000000 ) + *dco =2 ; +else + *dco =4 ; +/* +* target sigma-delta to near 250MHz +* sd = ceil[(m/(n+1)) * (clkinp_MHz / 250)] +*/ + clkinp /=100000 ;/* shift from MHz to 10*Hz for 38.4 and 19.2*/ + mod1 = (clkinp * m) % (250 * n); + sd = (clkinp * m) / (250 * n); + mod2 = sd %10 ; + sd /=10 ; + +if (mod1 + mod2) + ++sd; + *sd_div = sd; +}/* Non-CORE DPLL rate set code */
arch/arm/mach-omap2/clock34xx.c +7
-0@@ -707,6 +741,13 @@ static int omap3_noncore_dpll_program(struct clk *clk, u16 m, u8 n, u16 freqsel) v &= ~(dd->mult_mask | dd->div1_mask); v |= m <<__ffs (dd->mult_mask); v |= (n -1 ) <<__ffs (dd->div1_mask); +if (dd->jtype) { +u8 dco, sd_div; +lookup_dco_sddiv (clk, &dco, &sd_div, m, n); + v &= ~(dd->dco_sel_mask | dd->sd_div_mask); + v |= dco <<__ffs (dd->dco_sel_mask); + v |= sd_div <<__ffs (dd->sd_div_mask); + }__raw_writel (v, dd->mult_div1_reg);/* We let the clock framework set the other output
dividers later */arch/arm/mach-omap2/clock34xx.c +1
-1@@ -1022,7 +1063,7 @@ static unsigned long omap3_clkoutx2_recalc(struct clk *clk) v =__raw_readl (dd->control_reg) & dd->enable_mask; v >>=__ffs (dd->enable_mask); -if (v !=OMAP3XXX_EN_DPLL_LOCKED ) +if (v !=OMAP3XXX_EN_DPLL_LOCKED && (!dd->jtype)) rate = clk->parent->rate;else arch/arm/mach-omap2/clock34xx.c +2
-0rate = clk->parent->rate *2 ;@@ -1135,6 +1176,8 @@ int __init omap2_clk_init(void) cpu_mask |=RATE_IN_3430ES2 ; cpu_clkflg |=CK_3430ES2 ; } +if (omap3_has_jtype_dpll4 ()) + dpll4_ck.dpll_data->jtype =1 ; }clk_init (&omap2_clk_functions);arch/arm/mach-omap2/cm-regbits-34xx.h +5
-1@@ -516,9 +516,13 @@/* CM_CLKSEL2_PLL */ #define OMAP3430_PERIPH_DPLL_MULT_SHIFT 8 -#define OMAP3430_PERIPH_DPLL_MULT_MASK (0x7ff << 8) +#define OMAP3430_PERIPH_DPLL_MULT_MASK (0xfff << 8)#define OMAP3430_PERIPH_DPLL_DIV_SHIFT 0#define OMAP3430_PERIPH_DPLL_DIV_MASK (0x7f << 0) +#define OMAP3630_PERIPH_DPLL_DCO_SEL_SHIFT 21 +#define OMAP3630_PERIPH_DPLL_DCO_SEL_MASK (0x7 << 21) +#define OMAP3630_PERIPH_DPLL_SD_DIV_SHIFT 24 +#define OMAP3630_PERIPH_DPLL_SD_DIV_MASK (0xff << 24)/*
CM_CLKSEL3_PLL*/
#defineOMAP3430_DIV_96M_SHIFT0arch/arm/mach-omap2/id.c +3
-0@@ -176,6 +176,8 @@ void __init omap3_check_features(void)OMAP3_CHECK_FEATURE (status,NEON );OMAP3_CHECK_FEATURE (status,ISP ); +if (cpu_is_omap3630 ()) + omap3_features |=OMAP3_HAS_JTYPE_DPLL4 ;/* * TODO: Get additional info (where applicable) * e.g. Size of L2 cache. @@ -314,6 +316,7 @@ void __init omap3_cpuinfo(void)OMAP3_SHOW_FEATURE (sgx);OMAP3_SHOW_FEATURE (neon);OMAP3_SHOW_FEATURE (isp); +OMAP3_SHOW_FEATURE (jtype_dpll4); }/* arch/arm/plat-omap/include/plat/clock.h +3
-0@@ -60,6 +60,9 @@ struct dpll_data {void __iomem *idlest_reg;u32 autoidle_mask;u32 freqsel_mask; +u32 dco_sel_mask; +u32 sd_div_mask; +u8 jtype;u32 idlest_mask;u8 auto_recal_bit;u8 recal_en_bit;arch/arm/plat-omap/include/plat/cpu.h +2
-0@@ -482,6 +482,7 @@ extern u32 omap3_features;#define OMAP3_HAS_SGX BIT(2)#define OMAP3_HAS_NEON BIT(3)#define OMAP3_HAS_ISP BIT(4) +#define OMAP3_HAS_JTYPE_DPLL4 BIT(5)#define OMAP3_HAS_FEATURE (feat,flag) \ static inline unsigned int omap3_has_ ##feat(void) \@@ -494,5 +495,6 @@ OMAP3_HAS_FEATURE(sgx, SGX) OMAP3_HAS_FEATURE(iva, IVA) OMAP3_HAS_FEATURE(neon, NEON) OMAP3_HAS_FEATURE(isp, ISP) +OMAP3_HAS_FEATURE(jtype_dpll4, JTYPE_DPLL4)#endif Signature · 7 lines
1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
RE: [PATCH 2/2] OMAP3:clk: introduce DPLL4 jtype support
Quoted 11 lines
From: Aguirre Rodriguez, Sergio Alberto
Sent: Tuesday, October 20, 2009 9:16 AMQuoted 1 line
+ *
lookup_dco_sddiv-j-type DPLL4 compensation variablesPut a space before the j-type, and add better description. Doesn't clarify what it really does IMHO:
Something like:
"*lookup_dco_sddiv- Set j-type DPLL4 compensation variables"
For 45nm it was necessary to use a different DPLL IP for DPLL4 (dpllj). The other DPLLs are same which was used in 65nm (dpllm). The register interface is slightly different.
Code could have said is type A or B, but simple choice was to follow internal name convention.
Regards,
Richard W.
RE: [PATCH 2/2] OMAP3:clk: introduce DPLL4 jtype support
Quoted 15 lines
From: Woodruff, Richard
Sent: Tuesday, October 20, 2009 9:48 AMQuoted 10 lines
From: Aguirre Rodriguez, Sergio Alberto
Sent: Tuesday, October 20, 2009 9:16 AMQuoted 1 line
+ *
lookup_dco_sddiv-j-type DPLL4 compensation variablesPut a space before the j-type, and add better description. Doesn't clarify what it really does IMHO:
Something like:
"*lookup_dco_sddiv- Set j-type DPLL4 compensation variables"
Quoted 7 lines
For 45nm it was necessary to use a different DPLL IP for DPLL4 (dpllj). The other DPLLs are same which was used in 65nm (dpllm). The register interface is slightly different.
Code could have said is type A or B, but simple choice was to follow internal name convention.
Any comments on a neat handling of condition where clk->parent is NULL? A BUG_ON(!clk->parent) is good?
Regards,
Nishanth Menon
Re: [PATCH 1/2] OMAP3: move check_revision above check_features
In reply to Nishanth MenonQuoted 5 lines · Nishanth Menon
omap3_check_revision()does not depend onomap3_check_features()move this above so that we can add logic based on revision detected incheck_features.Signed-off-by Nishanth Menon <[email protected]>
Br,
MW
Tony Lindgren
maintainerPATCH 1/2 OMAP3: move check_revision above check_features
In reply to Nishanth MenonThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): fbb9e29aa28c779f48c9af03988c602e2ed7c5bb
PatchWorks
http://patchwork.kernel.org/patch/54925/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=fbb9e29aa28c779f48c9af03988c602e2ed7c5bb