Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

[mirror_ubuntu-artful-kernel.git] / arch / arm / boot / dts / r8a7778.dtsi

diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index e571d66ea0fe17218d02b9f0d349b82efd24d604..d0db998effc8e2d8e4dde10e4c28794f20560903 100644 (file)
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -14,8 +14,6 @@
  * kind, whether express or implied.
  */
 
-/include/ "skeleton.dtsi"
-
 #include <dt-bindings/clock/r8a7778-clock.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/interrupt-controller/irq.h>
@@ -23,6 +21,8 @@
 / {
        compatible = "renesas,r8a7778";
        interrupt-parent = <&gic>;
+       #address-cells = <1>;
+       #size-cells = <1>;
 
        cpus {
                #address-cells = <1>;
@@ -626,4 +626,9 @@
                                "sru-src6", "sru-src7", "sru-src8";
                };
        };
+
+       rst: reset-controller@ffcc0000 {
+               compatible = "renesas,r8a7778-reset-wdt";
+               reg = <0xffcc0000 0x40>;
+       };
 };