2 files changed, 44 insertions, 9 deletions

diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 5ddd4906f7a7..7bd1bbccc43c 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -455,13 +455,13 @@ choice
                   Please adjust DEBUG_UART_PHYS and DEBUG_UART_BASE configuration
                   options based on your needs.
 
-        config DEBUG_MVEBU_UART
-                bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
+        config DEBUG_MVEBU_UART0
+                bool "Kernel low-level debugging messages via MVEBU UART0 (old bootloaders)"
                 depends on ARCH_MVEBU
                 select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
-                  on MVEBU based platforms.
+                  on MVEBU based platforms on UART0.
 
                   This option should be used with the old bootloaders
                   that left the internal registers mapped at
@@ -474,13 +474,28 @@ choice
                   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)"
+        config DEBUG_MVEBU_UART0_ALTERNATE
+                bool "Kernel low-level debugging messages via MVEBU UART0 (new bootloaders)"
                 depends on ARCH_MVEBU
                 select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
-                  on MVEBU based platforms.
+                  on MVEBU based platforms on UART0.
+
+                  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_MVEBU_UART1_ALTERNATE
+                bool "Kernel low-level debugging messages via MVEBU UART1 (new bootloaders)"
+                depends on ARCH_MVEBU
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on MVEBU based platforms on UART1.
 
                   This option should be used with the new bootloaders
                   that remap the internal registers at 0xf1000000.
@@ -1282,7 +1297,7 @@ config DEBUG_UART_PHYS
         default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
         default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
         default 0xd0000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
-        default 0xd0012000 if DEBUG_MVEBU_UART
+        default 0xd0012000 if DEBUG_MVEBU_UART0
         default 0xc81004c0 if DEBUG_MESON_UARTAO
         default 0xd4017000 if DEBUG_MMP_UART2
         default 0xd4018000 if DEBUG_MMP_UART3
@@ -1296,7 +1311,8 @@ config DEBUG_UART_PHYS
         default 0xe8008000 if DEBUG_R7S72100_SCIF2
         default 0xf0000be0 if ARCH_EBSA110
         default 0xf040ab00 if DEBUG_BRCMSTB_UART
-        default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
+        default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE
+        default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE
         default 0xf1012000 if ARCH_DOVE || ARCH_MV78XX0 || \
                                 ARCH_ORION5X
         default 0xf7fc9000 if DEBUG_BERLIN_UART
@@ -1377,7 +1393,8 @@ config DEBUG_UART_VIRT
         default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
         default 0xfeb31000 if DEBUG_KEYSTONE_UART1
         default 0xfec02000 if DEBUG_SOCFPGA_UART
-        default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
+        default 0xfec12000 if DEBUG_MVEBU_UART0 || DEBUG_MVEBU_UART0_ALTERNATE
+        default 0xfec12100 if DEBUG_MVEBU_UART1_ALTERNATE
         default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
         default 0xfec90000 if DEBUG_RK32_UART2
         default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
diff --git a/arch/arm/mach-mvebu/mvebu-soc-id.h b/arch/arm/mach-mvebu/mvebu-soc-id.h
index c16bb68ca81f..e124a0b82a3e 100644
--- a/arch/arm/mach-mvebu/mvebu-soc-id.h
+++ b/arch/arm/mach-mvebu/mvebu-soc-id.h
@@ -20,10 +20,28 @@
 #define MV78XX0_A0_REV      0x1
 #define MV78XX0_B0_REV      0x2
 
+/* Amada 370 ID */
+#define ARMADA_370_DEV_ID   0x6710
+
+/* Amada 370 Revision */
+#define ARMADA_370_A1_REV   0x1
+
+/* Armada 375 ID */
+#define ARMADA_375_DEV_ID   0x6720
+
 /* Armada 375 */
 #define ARMADA_375_Z1_REV   0x0
 #define ARMADA_375_A0_REV   0x3
 
+/* Armada 38x ID */
+#define ARMADA_380_DEV_ID   0x6810
+#define ARMADA_385_DEV_ID   0x6820
+#define ARMADA_388_DEV_ID   0x6828
+
+/* Armada 38x Revision */
+#define ARMADA_38x_Z1_REV   0x0
+#define ARMADA_38x_A0_REV   0x4
+
 #ifdef CONFIG_ARCH_MVEBU
 int mvebu_get_soc_id(u32 *dev, u32 *rev);
 #else