ARM: dts: BCM5301X: Move CRU devices to the CRU node

Clocks and thermal blocks are part of the CRU ("Clock and Reset Unit" or
"Central Resource Unit").

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>

diff --git a/arch/arm/boot/dts/bcm5301x.dtsi b/arch/arm/boot/dts/bcm5301x.dtsi
index bcb32fc698ab2f88db3fda71e5442f6c18f442a4..90c09c48721b950beec26faaca49264bead7888d 100644 (file)
--- a/arch/arm/boot/dts/bcm5301x.dtsi
+++ b/arch/arm/boot/dts/bcm5301x.dtsi
@@ -428,6 +428,26 @@
                        #address-cells = <1>;
                        #size-cells = <1>;
 
+                       lcpll0: lcpll0@100 {
+                               #clock-cells = <1>;
+                               compatible = "brcm,nsp-lcpll0";
+                               reg = <0x100 0x14>;
+                               clocks = <&osc>;
+                               clock-output-names = "lcpll0", "pcie_phy",
+                                                    "sdio", "ddr_phy";
+                       };
+
+                       genpll: genpll@140 {
+                               #clock-cells = <1>;
+                               compatible = "brcm,nsp-genpll";
+                               reg = <0x140 0x24>;
+                               clocks = <&osc>;
+                               clock-output-names = "genpll", "phy",
+                                                    "ethernetclk",
+                                                    "usbclk", "iprocfast",
+                                                    "sata1", "sata2";
+                       };
+
                        pinctrl: pin-controller@1c0 {
                                compatible = "brcm,bcm4708-pinmux";
                                reg = <0x1c0 0x24>;
@@ -454,32 +474,13 @@
                                        function = "uart1";
                                };
                        };
-               };
-       };
-
-       lcpll0: lcpll0@1800c100 {
-               #clock-cells = <1>;
-               compatible = "brcm,nsp-lcpll0";
-               reg = <0x1800c100 0x14>;
-               clocks = <&osc>;
-               clock-output-names = "lcpll0", "pcie_phy", "sdio",
-                                    "ddr_phy";
-       };
 
-       genpll: genpll@1800c140 {
-               #clock-cells = <1>;
-               compatible = "brcm,nsp-genpll";
-               reg = <0x1800c140 0x24>;
-               clocks = <&osc>;
-               clock-output-names = "genpll", "phy", "ethernetclk",
-                                    "usbclk", "iprocfast", "sata1",
-                                    "sata2";
-       };
-
-       thermal: thermal@1800c2c0 {
-               compatible = "brcm,ns-thermal";
-               reg = <0x1800c2c0 0x10>;
-               #thermal-sensor-cells = <0>;
+                       thermal: thermal@2c0 {
+                               compatible = "brcm,ns-thermal";
+                               reg = <0x2c0 0x10>;
+                               #thermal-sensor-cells = <0>;
+                       };
+               };
        };
 
        srab: srab@18007000 {