13 files changed, 107 insertions, 81 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 1d41908d5cda..e6a6ab1b10d7 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -303,12 +303,37 @@ choice
                   their output to the serial port on MSM 8960 devices.
 
         config DEBUG_MVEBU_UART
-                bool "Kernel low-level debugging messages via MVEBU UART"
+                bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
                 depends on ARCH_MVEBU
                 help
                   Say Y here if you want kernel low-level debugging support
                   on MVEBU based platforms.
 
+                  This option should be used with the old bootloaders
+                  that left the internal registers mapped at
+                  0xd0000000. As of today, this is the case on
+                  platforms such as the Globalscale Mirabox or the
+                  Plathome OpenBlocks AX3, when using the original
+                  bootloader.
+
+                  If the wrong DEBUG_MVEBU_UART* option is selected,
+                  when u-boot hands over to the kernel, the system
+                  silently crashes, with no serial output at all.
+
+        config DEBUG_MVEBU_UART_ALTERNATE
+                bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)"
+                depends on ARCH_MVEBU
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on MVEBU based platforms.
+
+                  This option should be used with the new bootloaders
+                  that remap the internal registers at 0xf1000000.
+
+                  If the wrong DEBUG_MVEBU_UART* option is selected,
+                  when u-boot hands over to the kernel, the system
+                  silently crashes, with no serial output at all.
+
         config DEBUG_NOMADIK_UART
                 bool "Kernel low-level debugging messages via NOMADIK UART"
                 depends on ARCH_NOMADIK
@@ -632,7 +657,8 @@ config DEBUG_LL_INCLUDE
                                  DEBUG_IMX51_UART || \
                                  DEBUG_IMX53_UART ||\
                                  DEBUG_IMX6Q_UART
-        default "debug/mvebu.S" if DEBUG_MVEBU_UART
+        default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
+                                   DEBUG_MVEBU_UART_ALTERNATE
         default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
         default "debug/nomadik.S" if DEBUG_NOMADIK_UART
         default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 550eb772c30e..52a1f5efc086 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -80,7 +80,7 @@
 
                         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 @@
 
                         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@74000 {
                                 compatible = "marvell,armada-370-neta";
-                                reg = <0x74000 0x2500>;
+                                reg = <0x74000 0x4000>;
                                 interrupts = <10>;
                                 clocks = <&gateclk 3>;
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 6ab56bd35de9..488ca5eb9a55 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -107,7 +107,7 @@
 
                         ethernet@34000 {
                                 compatible = "marvell,armada-370-neta";
-                                reg = <0x34000 0x2500>;
+                                reg = <0x34000 0x4000>;
                                 interrupts = <14>;
                                 clocks = <&gateclk 1>;
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 5b902f9a3af2..1ee8540b0eba 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -88,7 +88,7 @@
 
                         ethernet@30000 {
                                 compatible = "marvell,armada-370-neta";
-                                reg = <0x30000 0x2500>;
+                                reg = <0x30000 0x4000>;
                                 interrupts = <12>;
                                 clocks = <&gateclk 2>;
                                 status = "disabled";
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 804b1dae4330..731814e2c189 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -100,5 +100,3 @@ CONFIG_TIMER_STATS=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
diff --git a/arch/arm/include/debug/mvebu.S b/arch/arm/include/debug/mvebu.S
index df191afa3be1..6517311a1c91 100644
--- a/arch/arm/include/debug/mvebu.S
+++ b/arch/arm/include/debug/mvebu.S
@@ -11,7 +11,12 @@
  * published by the Free Software Foundation.
 */
 
+#ifdef CONFIG_DEBUG_MVEBU_UART_ALTERNATE
+#define ARMADA_370_XP_REGS_PHYS_BASE    0xf1000000
+#else
 #define ARMADA_370_XP_REGS_PHYS_BASE    0xd0000000
+#endif
+
 #define ARMADA_370_XP_REGS_VIRT_BASE    0xfec00000
 
         .macro  addruart, rp, rv, tmp
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index ebbc99739726..97cbb8021919 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -15,12 +15,12 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/clk-provider.h>
+#include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
 #include <linux/time-armada-370-xp.h>
 #include <linux/dma-mapping.h>
 #include <linux/mbus.h>
-#include <linux/irqchip.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -29,45 +29,49 @@