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>

diff --git a/Documentation/devicetree/bindings/clock/altr_socfpga.txt b/Documentation/devicetree/bindings/clock/altr_socfpga.txt
index 5dfd145d3ccf673492e91eee8f9b43d94a3faee0..f72e80e0dade820adb35db2498566c487e51b40a 100644 (file)
--- a/Documentation/devicetree/bindings/clock/altr_socfpga.txt
+++ b/Documentation/devicetree/bindings/clock/altr_socfpga.txt
@@ -21,8 +21,8 @@ Optional properties:
 - fixed-divider : If clocks have a fixed divider value, use this property.
 - clk-gate : For "socfpga-gate-clk", clk-gate contains the gating register
         and the bit index.
-- div-reg : For "socfpga-gate-clk", div-reg contains the divider register, bit shift,
-        and width.
+- div-reg : For "socfpga-gate-clk" and "socfpga-periph-clock", div-reg contains
+       the divider register, bit shift, and width.
 - clk-phase : For the sdmmc_clk, contains the value of the clock phase that controls
        the SDMMC CIU clock. The first value is the clk_sample(smpsel), and the second
        value is the cclk_in_drv(drvsel). The clk-phase is used to enable the correct

diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index 917464ac01ef1cffb6c073aacc70490744d9ab95..280966b92e5ed3863f0f9750b10a52fc9f4508d9 100644 (file)
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -148,7 +148,7 @@
                                                        #clock-cells = <0>;
                                                        compatible = "altr,socfpga-perip-clk";
                                                        clocks = <&main_pll>;
-                                                       fixed-divider = <2>;
+                                                       div-reg = <0xe0 0 9>;
                                                        reg = <0x48>;
                                                };
 
@@ -156,7 +156,7 @@
                                                        #clock-cells = <0>;
                                                        compatible = "altr,socfpga-perip-clk";
                                                        clocks = <&main_pll>;
-                                                       fixed-divider = <4>;
+                                                       div-reg = <0xe4 0 9>;
                                                        reg = <0x4C>;
                                                };
 
@@ -164,7 +164,7 @@
                                                        #clock-cells = <0>;
                                                        compatible = "altr,socfpga-perip-clk";
                                                        clocks = <&main_pll>;
-                                                       fixed-divider = <4>;
+                                                       div-reg = <0xe8 0 9>;
                                                        reg = <0x50>;
                                                };