clk: ti: add am33xx spread spectrum clock support
Subsystems (3)
v6 cover clk: ti: add am33xx spread spectrum clock support
As reported by the TI spruh73x/spruhl7x RM, MPU and LCD modules support spread spectrum clocking (SSC) on their output clocks. SSC is used to spread the spectral peaking of the clock to reduce any electromagnetic interference (EMI) that may be caused due to the clock’s fundamental or any of its harmonics.
The series allows you to enable and adjust the spread spectrum clocking for all am33xx/am43xx PLLs for which it is supported. All these issues have been fixed.
Previous versions of the series did not supported SSC for am43xx SOCs, causing clock registration failure for DPLLs. Furthermore, for am33xx SOCs, clock registration failed for DPLLs for which SSC is not supported.
Changes in v6:
- Add Tero Kristo review tag.
Changes in v5:
- Remove ssc_ack_mask field from dpll_data structure. It was not used.
- Change ssc_downspread type from u8 to bool in dpll_data structure.
Changes in v4:
- Add Stephen Boyd review tag.
- Add Rob Herring review tag.
- Add SSC registers for CORE, DDR and PER PLLs.
- Update commit message.
- Update commit message.
Changes in v3:
- Add '-hz' suffix to "ti,ssc-modfreq" binding.
- Add Tony Lindgren acked tag.
- Use "ti,ssc-modfreq-hz" binding instead of "ti,ssc-modfreq".
Changes in v2:
- Remove SSC registers from dpll_core_ck@490 node (SSC is not supported)
- Add SSC registers to dpll_mpu_ck@488 node.
- Move the DT changes to the previous patch in the series.
Dario Binacchi (5):
clk: ti: fix typo in routine description
dt-bindings: ti: dpll: add spread spectrum support
ARM: dts: am33xx-clocks: add spread spectrum support
ARM: dts: am43xx-clocks: add spread spectrum support
clk: ti: add am33xx/am43xx spread spectrum clock support
.../devicetree/bindings/clock/ti/dpll.txt | 20 +++++ arch/arm/boot/dts/am33xx-clocks.dtsi | 10 +-- arch/arm/boot/dts/am43xx-clocks.dtsi | 12 +-- drivers/clk/ti/dpll.c | 39 +++++++++ drivers/clk/ti/dpll3xxx.c | 87 ++++++++++++++++++- include/linux/clk/ti.h | 22 +++++ 6 files changed, 178 insertions(+), 12 deletions(-)
Signature · 1 line
2.17.1
PATCH v6 1/5 clk: ti: fix typo in routine description
Replace _omap3_noncore_dpll_program with omap3_noncore_dpll_program.
---
(no changes since v4)
Changes in v4:
- Add Stephen Boyd review tag.
drivers/clk/ti/dpll3xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/ti/dpll3xxx.c +1 -1
@@ -292,7 +292,7 @@ static void _lookup_sddiv(struct clk_hw_omap *clk, u8 *sd_div, u16 m, u8 n) }/** -* _omap3_noncore_dpll_program - set non-core DPLL M,N values directly +* omap3_noncore_dpll_program - set non-core DPLL M,N values directly * @clk: struct clk * of DPLL to set * @freqsel: FREQSEL value to set *
Signature · 1 line
2.17.1
PATCH v6 2/5 dt-bindings: ti: dpll: add spread spectrum support
In reply to Dario BinacchiDT bindings for enabling and adjusting spread spectrum clocking have been added.
---
(no changes since v4)
Changes in v4:
- Add Rob Herring review tag.
Changes in v3:
- Add '-hz' suffix to "ti,ssc-modfreq" binding.
.../devicetree/bindings/clock/ti/dpll.txt | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+)
Documentation/devicetree/bindings/clock/ti/dpll.txt +20 -0
@@ -42,6 +42,11 @@ Required properties: "idlest" - contains the idle status register base address "mult-div1" - contains the multiplier / divider register base address "autoidle" - contains the autoidle register base address (optional) + "ssc-deltam" - DPLL supports spread spectrum clocking (SSC), contains + the frequency spreading register base address (optional) + "ssc-modfreq" - DPLL supports spread spectrum clocking (SSC), contains + the modulation frequency register base address + (optional) ti,am3-* dpll types do not have autoidle register ti,omap2-* dpll type does not support idlest / autoidle registers
@@ -51,6 +56,14 @@ Optional properties: - ti,low-power-stop : DPLL supports low power stop mode, gating output - ti,low-power-bypass : DPLL output matches rate of parent bypass clock - ti,lock : DPLL locks in programmed rate + - ti,min-div : the minimum divisor to start from to round the DPLL + target rate + - ti,ssc-deltam : DPLL supports spread spectrum clocking, frequency + spreading in permille (10th of a percent) + - ti,ssc-modfreq-hz : DPLL supports spread spectrum clocking, spread + spectrum modulation frequency + - ti,ssc-downspread : DPLL supports spread spectrum clocking, boolean + to enable the downspread feature Examples: dpll_core_ck: dpll_core_ck@44e00490 {
@@ -83,3 +96,10 @@ Examples: clocks = <&sys_ck>, <&sys_ck>; reg = <0x0500>, <0x0540>; }; + + dpll_disp_ck: dpll_disp_ck { + #clock-cells = <0>; + compatible = "ti,am3-dpll-no-gate-clock"; + clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; + reg = <0x0498>, <0x0448>, <0x0454>, <0x044c>, <0x0450>; + };
Signature · 1 line
2.17.1
PATCH v6 3/5 ARM: dts: am33xx-clocks: add spread spectrum support
In reply to Dario BinacchiRegisters for adjusting the spread spectrum clocking (SSC) have been added. As reported by the TI spruh73x RM, SSC is supported only for LCD and MPU PLLs, but the CM_SSC_DELTAMSTEP_DPLL_XXX and CM_SSC_MODFREQDIV_DPLL_XXX registers, as well as the enable field in the CM_CLKMODE_DPLL_XXX registers are mapped for all PLLs (CORE, MPU, DDR, PER, DISP).
---
(no changes since v4)
Changes in v4:
- Add SSC registers for CORE, DDR and PER PLLs.
- Update commit message.
Changes in v3:
- Add Tony Lindgren acked tag.
Changes in v2:
- Remove SSC registers from dpll_core_ck@490 node (SSC is not supported)
- Add SSC registers to dpll_mpu_ck@488 node.
arch/arm/boot/dts/am33xx-clocks.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/arm/boot/dts/am33xx-clocks.dtsi +5 -5
@@ -164,7 +164,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-core-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x0490>, <0x045c>, <0x0468>; + reg = <0x0490>, <0x045c>, <0x0468>, <0x0460>, <0x0464>; }; dpll_core_x2_ck: dpll_core_x2_ck {
@@ -204,7 +204,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x0488>, <0x0420>, <0x042c>; + reg = <0x0488>, <0x0420>, <0x042c>, <0x0424>, <0x0428>; }; dpll_mpu_m2_ck: dpll_mpu_m2_ck@4a8 {
@@ -220,7 +220,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-no-gate-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x0494>, <0x0434>, <0x0440>; + reg = <0x0494>, <0x0434>, <0x0440>, <0x0438>, <0x043c>; }; dpll_ddr_m2_ck: dpll_ddr_m2_ck@4a0 {
@@ -244,7 +244,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-no-gate-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x0498>, <0x0448>, <0x0454>; + reg = <0x0498>, <0x0448>, <0x0454>, <0x044c>, <0x0450>; }; dpll_disp_m2_ck: dpll_disp_m2_ck@4a4 {
@@ -261,7 +261,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-no-gate-j-type-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x048c>, <0x0470>, <0x049c>; + reg = <0x048c>, <0x0470>, <0x049c>, <0x0474>, <0x0478>; }; dpll_per_m2_ck: dpll_per_m2_ck@4ac {
Signature · 1 line
2.17.1
PATCH v6 4/5 ARM: dts: am43xx-clocks: add spread spectrum support
In reply to Dario BinacchiRegisters for adjusting the spread spectrum clocking (SSC) have been added. As reported by the TI spruhl7x RM, SSC is supported only for LCD and MPU PLLs, but the PRCM_CM_SSC_DELTAMSTEP_DPLL_XXX and PRCM_CM_SSC_MODFREQDIV_DPLL_XXX registers, as well as the enable field in the PRCM_CM_CLKMODE_DPLL_XXX registers are mapped for all PLLs (CORE, MPU, DDR, PER, DISP, EXTDEV).
---
(no changes since v1)
arch/arm/boot/dts/am43xx-clocks.dtsi | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
arch/arm/boot/dts/am43xx-clocks.dtsi +6 -6
@@ -204,7 +204,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-core-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x2d20>, <0x2d24>, <0x2d2c>; + reg = <0x2d20>, <0x2d24>, <0x2d2c>, <0x2d48>, <0x2d4c>; }; dpll_core_x2_ck: dpll_core_x2_ck {
@@ -250,7 +250,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x2d60>, <0x2d64>, <0x2d6c>; + reg = <0x2d60>, <0x2d64>, <0x2d6c>, <0x2d88>, <0x2d8c>; }; dpll_mpu_m2_ck: dpll_mpu_m2_ck@2d70 {
@@ -276,7 +276,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x2da0>, <0x2da4>, <0x2dac>; + reg = <0x2da0>, <0x2da4>, <0x2dac>, <0x2dc8>, <0x2dcc>; }; dpll_ddr_m2_ck: dpll_ddr_m2_ck@2db0 {
@@ -294,7 +294,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x2e20>, <0x2e24>, <0x2e2c>; + reg = <0x2e20>, <0x2e24>, <0x2e2c>, <0x2e48>, <0x2e4c>; }; dpll_disp_m2_ck: dpll_disp_m2_ck@2e30 {
@@ -313,7 +313,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-j-type-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x2de0>, <0x2de4>, <0x2dec>; + reg = <0x2de0>, <0x2de4>, <0x2dec>, <0x2e08>, <0x2e0c>; }; dpll_per_m2_ck: dpll_per_m2_ck@2df0 {
@@ -557,7 +557,7 @@ #clock-cells = <0>; compatible = "ti,am3-dpll-clock"; clocks = <&sys_clkin_ck>, <&sys_clkin_ck>; - reg = <0x2e60>, <0x2e64>, <0x2e6c>; + reg = <0x2e60>, <0x2e64>, <0x2e6c>, <0x2e88>, <0x2e8c>; }; dpll_extdev_m2_ck: dpll_extdev_m2_ck@2e70 {
Signature · 1 line
2.17.1
Re: [PATCH v6 4/5] ARM: dts: am43xx-clocks: add spread spectrum support
Quoted 6 lines · Dario Binacchi
Registers for adjusting the spread spectrum clocking (SSC) have been added. As reported by the TI spruhl7x RM, SSC is supported only for LCD and MPU PLLs, but the
PRCM_CM_SSC_DELTAMSTEP_DPLL_XXXandPRCM_CM_SSC_MODFREQDIV_DPLL_XXXregisters, as well as the enable field in thePRCM_CM_CLKMODE_DPLL_XXXregisters are mapped for all PLLs (CORE, MPU, DDR, PER, DISP, EXTDEV).
This too:
PATCH v6 5/5 clk: ti: add am33xx/am43xx spread spectrum clock support
In reply to Dario BinacchiThe patch enables spread spectrum clocking (SSC) for MPU and LCD PLLs. As reported by the TI spruh73x/spruhl7x RM, SSC is only supported for the DISP/LCD and MPU PLLs on am33xx/am43xx. SSC is not supported for DDR, PER, and CORE PLLs.
Calculating the required values and setting the registers accordingly was taken from the set_mpu_spreadspectrum routine contained in the arch/arm/mach-omap2/am33xx/clock_am33xx.c file of the u-boot project.
In locked condition, DPLL output clock = CLKINP *[M/N]. In case of SSC enabled, the reference manual explains that there is a restriction of range of M values. Since the omap2_dpll_round_rate routine attempts to select the minimum possible N, the value of M obtained is not guaranteed to be within the range required. With the new "ti,min-div" parameter it is possible to increase N and consequently M to satisfy the constraint imposed by SSC.
---
Changes in v6:
- Add Tero Kristo review tag.
Changes in v5:
- Remove ssc_ack_mask field from dpll_data structure. It was not used.
- Change ssc_downspread type from u8 to bool in dpll_data structure.
Changes in v4:
- Update commit message.
Changes in v3:
- Use "ti,ssc-modfreq-hz" binding instead of "ti,ssc-modfreq".
Changes in v2:
- Move the DT changes to the previous patch in the series.
drivers/clk/ti/dpll.c | 39 ++++++++++++++++++ drivers/clk/ti/dpll3xxx.c | 85 +++++++++++++++++++++++++++++++++++++++ include/linux/clk/ti.h | 22 ++++++++++ 3 files changed, 146 insertions(+)
drivers/clk/ti/dpll.c +39 -0
@@ -290,7 +290,9 @@ static void __init of_ti_dpll_setup(struct device_node *node,struct clk_init_data *init =NULL ;const char **parent_names =NULL ;struct dpll_data *dd =NULL ; +int ssc_clk_index;u8 dpll_mode =0 ; +u32 min_div; dd =kmemdup (ddt,sizeof (*dd),GFP_KERNEL ); clk_hw =kzalloc (sizeof (*clk_hw),GFP_KERNEL );
@@ -345,6 +347,27 @@ static void __init of_ti_dpll_setup(struct device_node *node,if (dd->autoidle_mask) {if (ti_clk_get_reg_addr (node,3 , &dd->autoidle_reg)) goto cleanup; + + ssc_clk_index =4 ; + }else { + ssc_clk_index =3 ; + } + +if (dd->ssc_deltam_int_mask && dd->ssc_deltam_frac_mask && + dd->ssc_modfreq_mant_mask && dd->ssc_modfreq_exp_mask) { +if (ti_clk_get_reg_addr (node, ssc_clk_index++, + &dd->ssc_deltam_reg)) + goto cleanup; + +if (ti_clk_get_reg_addr (node, ssc_clk_index++, + &dd->ssc_modfreq_reg)) + goto cleanup; + +of_property_read_u32 (node,"ti,ssc-modfreq-hz" , + &dd->ssc_modfreq); +of_property_read_u32 (node,"ti,ssc-deltam" , &dd->ssc_deltam); + dd->ssc_downspread = +of_property_read_bool (node,"ti,ssc-downspread" ); }if (of_property_read_bool (node,"ti,low-power-stop" ))
@@ -356,6 +379,10 @@ static void __init of_ti_dpll_setup(struct device_node *node,if (of_property_read_bool (node,"ti,lock" )) dpll_mode |=1 <<DPLL_LOCKED ; +if (!of_property_read_u32 (node,"ti,min-div" , &min_div) && + min_div > dd->min_divider) + dd->min_divider = min_div; +if (dpll_mode) dd->modes = dpll_mode;
@@ -585,8 +612,14 @@ static void __init of_ti_am3_no_gate_dpll_setup(struct device_node *node)const struct dpll_data dd = { .idlest_mask =0x1 , .enable_mask =0x7 , + .ssc_enable_mask =0x1 <<12 , + .ssc_downspread_mask =0x1 <<14 , .mult_mask =0x7ff <<8 , .div1_mask =0x7f , + .ssc_deltam_int_mask =0x3 <<18 , + .ssc_deltam_frac_mask =0x3ffff , + .ssc_modfreq_mant_mask =0x7f , + .ssc_modfreq_exp_mask =0x7 <<8 , .max_multiplier =2047 , .max_divider =128 , .min_divider =1 ,
@@ -645,8 +678,14 @@ static void __init of_ti_am3_dpll_setup(struct device_node *node)const struct dpll_data dd = { .idlest_mask =0x1 , .enable_mask =0x7 , + .ssc_enable_mask =0x1 <<12 , + .ssc_downspread_mask =0x1 <<14 , .mult_mask =0x7ff <<8 , .div1_mask =0x7f , + .ssc_deltam_int_mask =0x3 <<18 , + .ssc_deltam_frac_mask =0x3ffff , + .ssc_modfreq_mant_mask =0x7f , + .ssc_modfreq_exp_mask =0x7 <<8 , .max_multiplier =2047 , .max_divider =128 , .min_divider =1 ,
drivers/clk/ti/dpll3xxx.c +85 -0
97 lines not on this page · raw message
include/linux/clk/ti.h +22 -0
@@ -63,6 +63,17 @@ struct clk_omap_reg {* @auto_recal_bit: bitshift of the driftguard enable bit in @control_reg * @recal_en_bit: bitshift of the PRM_IRQENABLE_* bit for recalibration IRQs * @recal_st_bit: bitshift of the PRM_IRQSTATUS_* bit for recalibration IRQs +* @ssc_deltam_reg: register containing the DPLL SSC frequency spreading +* @ssc_modfreq_reg: register containing the DPLL SSC modulation frequency +* @ssc_modfreq_mant_mask: mask of the mantissa component in @ssc_modfreq_reg +* @ssc_modfreq_exp_mask: mask of the exponent component in @ssc_modfreq_reg +* @ssc_enable_mask: mask of the DPLL SSC enable bit in @control_reg +* @ssc_downspread_mask: mask of the DPLL SSC low frequency only bit in +* @control_reg +* @ssc_modfreq: the DPLL SSC frequency modulation in kHz +* @ssc_deltam: the DPLL SSC frequency spreading in permille (10th of percent) +* @ssc_downspread: require the only low frequency spread of the DPLL in SSC +* mode * @flags: DPLL type/features (see below) * * Possible values for @flags:
@@ -110,6 +121,17 @@ struct dpll_data {u8 auto_recal_bit;u8 recal_en_bit;u8 recal_st_bit; +struct clk_omap_reg ssc_deltam_reg; +struct clk_omap_reg ssc_modfreq_reg; +u32 ssc_deltam_int_mask; +u32 ssc_deltam_frac_mask; +u32 ssc_modfreq_mant_mask; +u32 ssc_modfreq_exp_mask; +u32 ssc_enable_mask; +u32 ssc_downspread_mask; +u32 ssc_modfreq; +u32 ssc_deltam; +bool ssc_downspread;u8 flags; };
Signature · 1 line
2.17.1