Merge branch 'omap/pm-voltdomain-cleanup' into next/soc

[sfrench/cifs-2.6.git] / arch / arm / include / debug / mvebu.S

diff --git a/arch/arm/include/debug/mvebu.S b/arch/arm/include/debug/mvebu.S
index df191afa3be14b1338481e05ae00cf35ddbb0cd5..6517311a1c915bfbb92c7e0b293e2adffa15b973 100644 (file)
--- 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