Merge branch 'async-scsi-resume' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / arm / boot / dts / armada-370-xp.dtsi

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 74b5964430ac3a7d833d8fce12eb655746acba4b..bbb40f62037dbaf67ac8a585a17817997e8c1a17 100644 (file)
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -44,8 +44,8 @@
                #size-cells = <1>;
                controller = <&mbusc>;
                interrupt-parent = <&mpic>;
-               pcie-mem-aperture = <0xe0000000 0x8000000>;
-               pcie-io-aperture  = <0xe8000000 0x100000>;
+               pcie-mem-aperture = <0xf8000000 0x7e00000>;
+               pcie-io-aperture  = <0xffe00000 0x100000>;
 
                devbus-bootcs {
                        compatible = "marvell,mvebu-devbus";
@@ -199,6 +199,10 @@
                                interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
                        };
 
+                       watchdog@20300 {
+                               reg = <0x20300 0x34>, <0x20704 0x4>;
+                       };
+
                        usb@50000 {
                                compatible = "marvell,orion-ehci";
                                reg = <0x50000 0x500>;