Merge branch 'pm-cpufreq'

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / rk3xxx.dtsi

diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi
index 26e5a968d49d1ffa39619d172237f28c4c74f1a7..2adf1cc9e85df4478c5ed329911dd613356d97f9 100644 (file)
--- a/arch/arm/boot/dts/rk3xxx.dtsi
+++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -31,11 +31,16 @@
                        reg = <0x1013c000 0x100>;
                };
 
-               pmu@20004000 {
-                       compatible = "rockchip,rk3066-pmu";
+               pmu: pmu@20004000 {
+                       compatible = "rockchip,rk3066-pmu", "syscon";
                        reg = <0x20004000 0x100>;
                };
 
+               grf: grf@20008000 {
+                       compatible = "syscon";
+                       reg = <0x20008000 0x200>;
+               };
+
                gic: interrupt-controller@1013d000 {
                        compatible = "arm,cortex-a9-gic";
                        interrupt-controller;