Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: socfpga: dts: Add div-reg to the main_pll clocks

The mpu_clk, main_clk, and dbg_base_clk outputs from the main PLL go through a
pre-divider. Update socfpga.dtsi to represent those dividers for these
clocks.

Re-use the "div-reg" property that was used for the socfpga-gate-clock as this
is the same thing. Also update the documentation.

Signed-off-by: Dinh Nguyen <dinguyen@altera.com>

+5 -5
+2 -2
Documentation/devicetree/bindings/clock/altr_socfpga.txt
··· 21 21 - fixed-divider : If clocks have a fixed divider value, use this property. 22 22 - clk-gate : For "socfpga-gate-clk", clk-gate contains the gating register 23 23 and the bit index. 24 - - div-reg : For "socfpga-gate-clk", div-reg contains the divider register, bit shift, 25 - and width. 24 + - div-reg : For "socfpga-gate-clk" and "socfpga-periph-clock", div-reg contains 25 + the divider register, bit shift, and width. 26 26 - clk-phase : For the sdmmc_clk, contains the value of the clock phase that controls 27 27 the SDMMC CIU clock. The first value is the clk_sample(smpsel), and the second 28 28 value is the cclk_in_drv(drvsel). The clk-phase is used to enable the correct
+3 -3
arch/arm/boot/dts/socfpga.dtsi
··· 148 148 #clock-cells = <0>; 149 149 compatible = "altr,socfpga-perip-clk"; 150 150 clocks = <&main_pll>; 151 - fixed-divider = <2>; 151 + div-reg = <0xe0 0 9>; 152 152 reg = <0x48>; 153 153 }; 154 154 ··· 156 156 #clock-cells = <0>; 157 157 compatible = "altr,socfpga-perip-clk"; 158 158 clocks = <&main_pll>; 159 - fixed-divider = <4>; 159 + div-reg = <0xe4 0 9>; 160 160 reg = <0x4C>; 161 161 }; 162 162 ··· 164 164 #clock-cells = <0>; 165 165 compatible = "altr,socfpga-perip-clk"; 166 166 clocks = <&main_pll>; 167 - fixed-divider = <4>; 167 + div-reg = <0xe8 0 9>; 168 168 reg = <0x50>; 169 169 }; 170 170