diff options
| author |   Eric Bénard <eric@eukrea.com> | 2010-07-16 15:09:06 +0200 |
|---|---|---|
| committer |   Sascha Hauer <s.hauer@pengutronix.de> | 2010-07-26 14:29:21 +0200 |
| commit | 7e688f0d77f90c531747afa552d72ea70c2f0803 (patch) | |
| tree | 10abc41e167d641ee5a07eeef38a2eba33b05723 | |
| parent | mxcmmc: convert to pm_ops and enable/disable clock (diff) | |
| download | linux-dev-7e688f0d77f90c531747afa552d72ea70c2f0803.tar.xz linux-dev-7e688f0d77f90c531747afa552d72ea70c2f0803.zip | |
imx25: fix low level debug
DEBUG_LL is actually broken on i.MX25, this patch fix it.
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/mach-mx25/clock.c | 3 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/debug-macro.S | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/mx25.h | 8 |
3 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-mx25/clock.c b/arch/arm/mach-mx25/clock.c index 1a58cae4d5e8..02f82478075f 100644 --- a/arch/arm/mach-mx25/clock.c +++ b/arch/arm/mach-mx25/clock.c @@ -292,6 +292,9 @@ int __init mx25_clocks_init(void) __raw_writel((1 << 19), CRM_BASE + CCM_CGCR0); __raw_writel((0xf << 16) | (3 << 26), CRM_BASE + CCM_CGCR1); __raw_writel((1 << 5), CRM_BASE + CCM_CGCR2); +#if defined(CONFIG_DEBUG_LL) && !defined(CONFIG_DEBUG_ICEDCC) + clk_enable(&uart1_clk); +#endif /* Clock source for lcdc and csi is upll */ __raw_writel(__raw_readl(CRM_BASE+0x64) | (1 << 7) | (1 << 0), diff --git a/arch/arm/plat-mxc/include/mach/debug-macro.S b/arch/arm/plat-mxc/include/mach/debug-macro.S index 0b6e11eaeb8c..25606409aabc 100644 --- a/arch/arm/plat-mxc/include/mach/debug-macro.S +++ b/arch/arm/plat-mxc/include/mach/debug-macro.S @@ -23,8 +23,8 @@ #error "CONFIG_DEBUG_LL is incompatible with multiple archs" #endif #include <mach/mx25.h> -#define UART_PADDR UART1_BASE_ADDR -#define UART_VADDR MX25_AIPS1_IO_ADDRESS(UART1_BASE_ADDR) +#define UART_PADDR MX25_UART1_BASE_ADDR +#define UART_VADDR MX25_AIPS1_IO_ADDRESS(MX25_UART1_BASE_ADDR) #endif #ifdef CONFIG_ARCH_MX2 diff --git a/arch/arm/plat-mxc/include/mach/mx25.h b/arch/arm/plat-mxc/include/mach/mx25.h index 2f2aad1032c1..11b044f5b10f 100644 --- a/arch/arm/plat-mxc/include/mach/mx25.h +++ b/arch/arm/plat-mxc/include/mach/mx25.h @@ -31,6 +31,9 @@ IMX_IO_ADDRESS(x, MX25_AIPS2) ?: \ IMX_IO_ADDRESS(x, MX25_AVIC)) +#define MX25_AIPS1_IO_ADDRESS(x) \ + (((x) - MX25_AIPS1_BASE_ADDR) + MX25_AIPS1_BASE_ADDR_VIRT) + #define MX25_UART1_BASE_ADDR 0x43f90000 #define MX25_UART2_BASE_ADDR 0x43f94000 #define MX25_AUDMUX_BASE_ADDR 0x43fb0000 @@ -70,9 +73,4 @@ #define MX25_INT_UART1 45 #define MX25_INT_FEC 57 -#if defined(IMX_NEEDS_DEPRECATED_SYMBOLS) -#define UART1_BASE_ADDR MX25_UART1_BASE_ADDR -#define UART2_BASE_ADDR MX25_UART2_BASE_ADDR -#endif - #endif /* ifndef __MACH_MX25_H__ */ |