ARM: dts: rockchip: add cru nodes and update device clocks to use it

This adds a node for the clock and reset unit on rk3188 and rk3066 SoCs and
also updates the device nodes retrieve their clocks from there, instead of
the previous gate clock nodes.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-By: Max Schwarz <max.schwarz@online.de>
Tested-By: Max Schwarz <max.schwarz@online.de>

1 files changed, 14 insertions, 4 deletions

diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi
index 238c996d4a7f..bf0741a89b7c 100644
--- a/arch/arm/boot/dts/rk3188.dtsi
+++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -15,6 +15,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/pinctrl/rockchip.h>
+#include <dt-bindings/clock/rk3188-cru.h>
 #include "rk3xxx.dtsi"
 #include "rk3188-clocks.dtsi"
 
@@ -74,6 +75,15 @@
                         };
                 };
 
+                cru: clock-controller@20000000 {
+                        compatible = "rockchip,rk3188-cru";
+                        reg = <0x20000000 0x1000>;
+                        rockchip,grf = <&grf>;
+
+                        #clock-cells = <1>;
+                        #reset-cells = <1>;
+                };
+
                 pinctrl@20008000 {
                         compatible = "rockchip,rk3188-pinctrl";
                         rockchip,grf = <&grf>;
@@ -87,7 +97,7 @@
                                 compatible = "rockchip,rk3188-gpio-bank0";
                                 reg = <0x2000a000 0x100>;
                                 interrupts = <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 9>;
+                                clocks = <&cru PCLK_GPIO0>;
 
                                 gpio-controller;
                                 #gpio-cells = <2>;
@@ -100,7 +110,7 @@
                                 compatible = "rockchip,gpio-bank";
                                 reg = <0x2003c000 0x100>;
                                 interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 10>;
+                                clocks = <&cru PCLK_GPIO1>;
 
                                 gpio-controller;
                                 #gpio-cells = <2>;
@@ -113,7 +123,7 @@
                                 compatible = "rockchip,gpio-bank";
                                 reg = <0x2003e000 0x100>;
                                 interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 11>;
+                                clocks = <&cru PCLK_GPIO2>;
 
                                 gpio-controller;
                                 #gpio-cells = <2>;
@@ -126,7 +136,7 @@
                                 compatible = "rockchip,gpio-bank";
                                 reg = <0x20080000 0x100>;
                                 interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;
-                                clocks = <&clk_gates8 12>;
+                                clocks = <&cru PCLK_GPIO3>;
 
                                 gpio-controller;
                                 #gpio-cells = <2>;