From 17377344c7c2addf30fd62812e941b644f33bb34 Mon Sep 17 00:00:00 2001 From: kfx Date: Tue, 11 Sep 2012 20:16:46 +0800 Subject: [PATCH] rk2928: rk2928_a720_defconfig: add usb debug config --- arch/arm/configs/rk2928_a720_defconfig | 2 +- arch/arm/mach-rk2928/common.c | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/rk2928_a720_defconfig b/arch/arm/configs/rk2928_a720_defconfig index 7f844c1def73..d218666ddeb0 100644 --- a/arch/arm/configs/rk2928_a720_defconfig +++ b/arch/arm/configs/rk2928_a720_defconfig @@ -23,7 +23,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_MODULE_FORCE_UNLOAD=y CONFIG_ARCH_RK2928=y CONFIG_RK_CLOCK_PROC=y -CONFIG_RK_DEBUG_UART=0 +CONFIG_RK_USB_UART=y CONFIG_MACH_RK2928_A720=y CONFIG_FIQ_DEBUGGER=y CONFIG_FIQ_DEBUGGER_NO_SLEEP=y diff --git a/arch/arm/mach-rk2928/common.c b/arch/arm/mach-rk2928/common.c index 41b7a3bb68e5..d26d028cdcfb 100755 --- a/arch/arm/mach-rk2928/common.c +++ b/arch/arm/mach-rk2928/common.c @@ -117,6 +117,18 @@ extern int __init clk_disable_unused(void); void __init rk2928_map_io(void) { rk2928_map_common_io(); +#ifdef DEBUG_UART_BASE + #ifdef CONFIG_RK_USB_UART + writel_relaxed(0x30003000, RK2928_GRF_BASE + GRF_UOC1_CON4); + #endif + writel_relaxed(0x07, DEBUG_UART_BASE + 0x88); + writel_relaxed(0x07, DEBUG_UART_BASE + 0x88); + writel_relaxed(0x00, DEBUG_UART_BASE + 0x04); + writel_relaxed(0x83, DEBUG_UART_BASE + 0x0c); + writel_relaxed(0x0d, DEBUG_UART_BASE + 0x00); + writel_relaxed(0x00, DEBUG_UART_BASE + 0x04); + writel_relaxed(0x03, DEBUG_UART_BASE + 0x0c); +#endif rk29_setup_early_printk(); rk2928_cpu_axi_init(); rk29_sram_init(); -- 2.34.1