ARM: dts: ls1021a: update the clockgen node

QorIQ platforms now use different clock bindings. Although we don't use
the device tree for clocks on this platform, it is helpful to sync it
because then the bindings will more closely match Linux. Additionally,
it allows for using more clock fractions (such as platform/4).

This corresponds to Linux commit b6f5e7019391 ("ARM: dts: ls1021a:
update the clockgen node").

Signed-off-by: Sean Anderson <sean.anderson@seco.com>

diff --git a/arch/arm/dts/ls1021a.dtsi b/arch/arm/dts/ls1021a.dtsi
index be330c130f599c56942da15006a29e6008a908e4..063655f7ac65a9880cd278b01317bcd3930fb085 100644 (file)
--- a/arch/arm/dts/ls1021a.dtsi
+++ b/arch/arm/dts/ls1021a.dtsi
@@ -31,17 +31,24 @@
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        reg = <0xf00>;
-                       clocks = <&cluster1_clk>;
+                       clocks = <&clockgen 1 0>;
                };
 
                cpu@f01 {
                        compatible = "arm,cortex-a7";
                        device_type = "cpu";
                        reg = <0xf01>;
-                       clocks = <&cluster1_clk>;
+                       clocks = <&clockgen 1 0>;
                };
        };
 
+       sysclk: sysclk {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <100000000>;
+               clock-output-names = "sysclk";
+       };
+
        timer {
                compatible = "arm,armv7-timer";
                interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>,
@@ -185,41 +192,10 @@
                };
 
                clockgen: clocking@1ee1000 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0x0 0x1ee1000 0x10000>;
-
-                       sysclk: sysclk {
-                               compatible = "fixed-clock";
-                               #clock-cells = <0>;
-                               clock-output-names = "sysclk";
-                       };
-
-                       cga_pll1: pll@800 {
-                               compatible = "fsl,qoriq-core-pll-2.0";
-                               #clock-cells = <1>;
-                               reg = <0x800 0x10>;
-                               clocks = <&sysclk>;
-                               clock-output-names = "cga-pll1", "cga-pll1-div2",
-                                                    "cga-pll1-div4";
-                       };
-
-                       platform_clk: pll@c00 {
-                               compatible = "fsl,qoriq-core-pll-2.0";
-                               #clock-cells = <1>;
-                               reg = <0xc00 0x10>;
-                               clocks = <&sysclk>;
-                               clock-output-names = "platform-clk", "platform-clk-div2";
-                       };
-
-                       cluster1_clk: clk0c0@0 {
-                               compatible = "fsl,qoriq-core-mux-2.0";
-                               #clock-cells = <0>;
-                               reg = <0x0 0x10>;
-                               clock-names = "pll1cga", "pll1cga-div2", "pll1cga-div4";
-                               clocks = <&cga_pll1 0>, <&cga_pll1 1>, <&cga_pll1 2>;
-                               clock-output-names = "cluster1-clk";
-                       };
+                       compatible = "fsl,ls1021a-clockgen";
+                       reg = <0x0 0x1ee1000 0x0 0x1000>;
+                       #clock-cells = <2>;
+                       clocks = <&sysclk>;
                };
 
                dspi0: dspi@2100000 {
@@ -229,7 +205,7 @@
                        reg = <0x2100000 0x10000>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
@@ -242,7 +218,7 @@
                        reg = <0x2110000 0x10000>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "dspi";
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        spi-num-chipselects = <6>;
                        big-endian;
                        status = "disabled";
@@ -265,7 +241,7 @@
                        reg = <0x2180000 0x10000>;
                        interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "i2c";
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        status = "disabled";
                };
 
@@ -276,7 +252,7 @@
                        reg = <0x2190000 0x10000>;
                        interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "i2c";
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        status = "disabled";
                };
 
@@ -287,7 +263,7 @@
                        reg = <0x21a0000 0x10000>;
                        interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
                        clock-names = "i2c";
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        status = "disabled";
                };
 
@@ -336,7 +312,7 @@
                        compatible = "fsl,ls1021a-lpuart";
                        reg = <0x2960000 0x1000>;
                        interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        clock-names = "ipg";
                        status = "disabled";
                };
@@ -345,7 +321,7 @@
                        compatible = "fsl,ls1021a-lpuart";
                        reg = <0x2970000 0x1000>;
                        interrupts = <GIC_SPI 82 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        clock-names = "ipg";
                        status = "disabled";
                };
@@ -354,7 +330,7 @@
                        compatible = "fsl,ls1021a-lpuart";
                        reg = <0x2980000 0x1000>;
                        interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        clock-names = "ipg";
                        status = "disabled";
                };
@@ -363,7 +339,7 @@
                        compatible = "fsl,ls1021a-lpuart";
                        reg = <0x2990000 0x1000>;
                        interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        clock-names = "ipg";
                        status = "disabled";
                };
@@ -372,7 +348,7 @@
                        compatible = "fsl,ls1021a-lpuart";
                        reg = <0x29a0000 0x1000>;
                        interrupts = <GIC_SPI 85 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        clock-names = "ipg";
                        status = "disabled";
                };
@@ -381,7 +357,7 @@
                        compatible = "fsl,imx21-wdt";
                        reg = <0x2ad0000 0x10000>;
                        interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        clock-names = "wdog-en";
                        big-endian;
                };
@@ -390,7 +366,7 @@
                        compatible = "fsl,vf610-sai";
                        reg = <0x2b50000 0x10000>;
                        interrupts = <GIC_SPI 132 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        clock-names = "sai";
                        dma-names = "tx", "rx";
                        dmas = <&edma0 1 47>,
@@ -403,7 +379,7 @@
                        compatible = "fsl,vf610-sai";
                        reg = <0x2b60000 0x10000>;
                        interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>;
                        clock-names = "sai";
                        dma-names = "tx", "rx";
                        dmas = <&edma0 1 45>,
@@ -424,8 +400,8 @@
                        dma-channels = <32>;
                        big-endian;
                        clock-names = "dmamux0", "dmamux1";
-                       clocks = <&platform_clk 1>,
-                                <&platform_clk 1>;
+                       clocks = <&clockgen 4 1>,
+                                <&clockgen 4 1>;
                };
 
                enet0: ethernet@2d10000 {