aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhangfei Gao <zhangfei.gao@linaro.org>2013-01-09 10:29:44 +0800
committerGuodong Xu <guodong.xu@linaro.org>2013-02-21 16:12:21 +0800
commit9977dcdb8ea7b7eb8a899646612253491cc64c78 (patch)
treee8caf8b7584dd9fd95a7175f707cf0dd669b4e80
parent0ef735d75f80948d0c9fb573f66d0997b7a6fe5c (diff)
ARM: hs: add debug ll support for HI3716 UART0
Add debug ll support for Hi3716 UART0. Signed-off-by: Zhangfei Gao <zhangfei.gao@linaro.org> Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
-rw-r--r--arch/arm/Kconfig.debug9
-rw-r--r--arch/arm/include/debug/hisilicon.S11
2 files changed, 19 insertions, 1 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index b7a3c7bbe02..3eecc2d1c06 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -240,6 +240,13 @@ choice
Say Y here if you want kernel low-level debugging support
on HI3620 UART0.
+ config DEBUG_HI3716_UART0
+ bool "Hisilicon HI3716 Debug UART0"
+ depends on ARCH_HS
+ help
+ Say Y here if you want kernel low-level debugging support
+ on HI3716 UART0.
+
config DEBUG_MMP_UART2
bool "Kernel low-level debugging message via MMP UART2"
depends on ARCH_MMP
@@ -507,7 +514,7 @@ config DEBUG_LL_INCLUDE
DEBUG_IMX50_IMX53_UART ||\
DEBUG_IMX6Q_UART
default "debug/highbank.S" if DEBUG_HIGHBANK_UART
- default "debug/hisilicon.S" if DEBUG_HI3620_UART0 || DEBUG_HI3620_UART4
+ default "debug/hisilicon.S" if DEBUG_HI3620_UART0 || DEBUG_HI3716_UART0
default "debug/mvebu.S" if DEBUG_MVEBU_UART
default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
diff --git a/arch/arm/include/debug/hisilicon.S b/arch/arm/include/debug/hisilicon.S
index 3f25488e133..2da0f6d5547 100644
--- a/arch/arm/include/debug/hisilicon.S
+++ b/arch/arm/include/debug/hisilicon.S
@@ -13,6 +13,9 @@
#define HI3620_UART0_PHYS_BASE 0xfcb00000
#define HI3620_UART0_VIRT_BASE 0xfeb00000
+#define HI3716_UART0_PHYS_BASE 0xf8b00000
+#define HI3716_UART0_VIRT_BASE 0xfeb00000
+
#if defined(CONFIG_DEBUG_HI3620_UART0)
.macro addruart,rp,rv,tmp
ldr \rp, =HI3620_UART0_PHYS_BASE
@@ -21,4 +24,12 @@
#include <asm/hardware/debug-pl01x.S>
+#elif defined(CONFIG_DEBUG_HI3716_UART0)
+ .macro addruart,rp,rv,tmp
+ ldr \rp, =HI3716_UART0_PHYS_BASE
+ ldr \rv, =HI3716_UART0_VIRT_BASE
+ .endm
+
+#include <asm/hardware/debug-pl01x.S>
+
#endif