Merge branch 'mvebu/fixes' into mvebu/for-next

diff --combined arch/arm/boot/dts/armada-370-db.dts
index 485ecf856fae691cb618612771d0a49b866d5142,dede3e737a4530f9f97446fb4519b9cd174ae4b3..19f3bf271915fc1dd843a7d10d50df353b4b52d2
--- 1/arch/arm/boot/dts/armada-370-db.dts
--- 2/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@@ -45,6 -45,15 +45,15 @@@
   *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
   *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
   *     OTHER DEALINGS IN THE SOFTWARE.
+  *
+  * Note: this Device Tree assumes that the bootloader has remapped the
+  * internal registers to 0xf1000000 (instead of the default
+  * 0xd0000000). The 0xf1000000 is the default used by the recent,
+  * DT-capable, U-Boot bootloaders provided by Marvell. Some earlier
+  * boards were delivered with an older version of the bootloader that
+  * left internal registers mapped at 0xd0000000. If you are in this
+  * situation, you should either update your bootloader (preferred
+  * solution) or the below Device Tree should be adjusted.
   */
  
  /dts-v1/;
@@@ -55,7 -64,7 +64,7 @@@
        compatible = "marvell,a370-db", "marvell,armada370", "marvell,armada-370-xp";
  
        chosen {
 -              bootargs = "console=ttyS0,115200 earlyprintk";
 +              stdout-path = "serial0:115200n8";
        };
  
        memory {
@@@ -64,7 -73,7 +73,7 @@@
        };
  
        soc {
-               ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
+               ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
  
                internal-regs {