aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-11-21 10:52:05 -0800
committerOlof Johansson <olof@lixom.net>2012-11-21 10:52:44 -0800
commite9f6d13513ea9fd33b0184db8fc33cf51baa584b (patch)
tree281401f6a868b888e30465eac233e084ed6d8bb3 /arch/arm/include
parent41739b60b3c00e0591d1a413276ddfa0d0b1ea89 (diff)
parent67bea88dd842deb3ed8327ad101970dbd615ddcb (diff)
Merge branch 'sunxi/soc2' into next/soc
From Maxime Ripard: Here is a pull request to add the support for Allwinner A10 SoCs. * sunxi/soc2: ARM: sunxi: Add sunxi restart function via onchip watchdog ARM: sunxi: Add sun4i and cubieboard support ARM: sunxi: Add earlyprintk support for UART0 (sun4i) ARM: sunxi: Restructure sunxi dts/dtsi files Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/debug/sunxi.S5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S
index 3bf61ca0df7..04eb56d5db2 100644
--- a/arch/arm/include/debug/sunxi.S
+++ b/arch/arm/include/debug/sunxi.S
@@ -10,7 +10,10 @@
* published by the Free Software Foundation.
*/
-#ifdef CONFIG_DEBUG_SUNXI_UART1
+#if defined(CONFIG_DEBUG_SUNXI_UART0)
+#define SUNXI_UART_DEBUG_PHYS_BASE 0x01c28000
+#define SUNXI_UART_DEBUG_VIRT_BASE 0xf1c28000
+#elif defined(CONFIG_DEBUG_SUNXI_UART1)
#define SUNXI_UART_DEBUG_PHYS_BASE 0x01c28400
#define SUNXI_UART_DEBUG_VIRT_BASE 0xf1c28400
#endif