Merge tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux...

Merge tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux into next/fixes-non-critical

From Jason Cooper:
mvebu fixes non-critical for v3.11 (round 1)
 - mvebu
    - fix register area length in dtsi for ethernet and sata
Signed-off-by: Olof Johansson <olof@lixom.net>

* tag 'fixes-non-3.11-1' of git://git.infradead.org/users/jcooper/linux:
  arm: mvebu: fix length of Ethernet registers area in .dtsi
  arm: mvebu: fix length of SATA registers area in .dtsi

arch/arm/boot/dts/armada-370-xp.dtsi

@@ -80,7 +80,7 @@ timer@20300 {
 
 			sata@a0000 {
 				compatible = "marvell,orion-sata";
-				reg = <0xa0000 0x2400>;
+				reg = <0xa0000 0x5000>;
 				interrupts = <55>;
 				clocks = <&gateclk 15>, <&gateclk 30>;
 				clock-names = "0", "1";
@@ -96,7 +96,7 @@ mdio {
 
 			ethernet@70000 {
 				compatible = "marvell,armada-370-neta";
-				reg = <0x70000 0x2500>;
+				reg = <0x70000 0x4000>;
 				interrupts = <8>;
 				clocks = <&gateclk 4>;
 				status = "disabled";
@@ -104,7 +104,7 @@ ethernet@70000 {
 
 			ethernet@74000 {
 				compatible = "marvell,armada-370-neta";
-				reg = <0x74000 0x2500>;
+				reg = <0x74000 0x4000>;
 				interrupts = <10>;
 				clocks = <&gateclk 3>;
 				status = "disabled";

arch/arm/boot/dts/armada-xp-mv78460.dtsi

@@ -107,7 +107,7 @@ gpio2: gpio@18180 {
 
 			ethernet@34000 {
 				compatible = "marvell,armada-370-neta";
-				reg = <0x34000 0x2500>;
+				reg = <0x34000 0x4000>;
 				interrupts = <14>;
 				clocks = <&gateclk 1>;
 				status = "disabled";

arch/arm/boot/dts/armada-xp.dtsi

@@ -88,7 +88,7 @@ system-controller@18200 {
 
 			ethernet@30000 {
 				compatible = "marvell,armada-370-neta";
-				reg = <0x30000 0x2500>;
+				reg = <0x30000 0x4000>;
 				interrupts = <12>;
 				clocks = <&gateclk 2>;
 				status = "disabled";