Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[linux.git] / arch / arm / boot / dts / prima2.dtsi

diff --git a/arch/arm/boot/dts/prima2.dtsi b/arch/arm/boot/dts/prima2.dtsi
index 8582ae41a5834e99ed26e5edc6f55971d2fa1d0c..1e82571d6823ef55169af9827efab952189e952c 100644 (file)
--- a/arch/arm/boot/dts/prima2.dtsi
+++ b/arch/arm/boot/dts/prima2.dtsi
@@ -76,9 +76,10 @@
                                #clock-cells = <1>;
                        };
 
-                       reset-controller@88010000 {
+                       rstc: reset-controller@88010000 {
                                compatible = "sirf,prima2-rstc";
                                reg = <0x88010000 0x1000>;
+                               #reset-cells = <1>;
                        };
 
                        rsc-controller@88020000 {
@@ -286,6 +287,7 @@
                                reg = <0xb00b0000 0x10000>;
                                interrupts = <12>;
                                clocks = <&clks 24>;
+                               #dma-cells = <1>;
                        };
 
                        dmac1: dma-controller@b0160000 {
@@ -294,6 +296,7 @@
                                reg = <0xb0160000 0x10000>;
                                interrupts = <13>;
                                clocks = <&clks 25>;
+                               #dma-cells = <1>;
                        };
 
                        vip@b00C0000 {