diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 17:07:04 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-10-25 17:07:04 +0200 |
| commit | eb045078140a44a4795fdf1fe9409f57a860a0aa (patch) | |
| tree | b41d4710981960cdef57141a852126c1ebdff59e /arch/arm | |
| parent | 6f0c0580b70c89094b3422ba81118c7b959c7556 (diff) | |
| parent | 852663d94f0cc44199c31c0e42d4801302f41705 (diff) | |
| download | talos-obmc-linux-eb045078140a44a4795fdf1fe9409f57a860a0aa.tar.gz talos-obmc-linux-eb045078140a44a4795fdf1fe9409f57a860a0aa.zip | |
Merge branch 'vexpress-fixes' of git://git.linaro.org/people/pawelmoll/linux into next/fixes-non-critical
* 'vexpress-fixes' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Make the debug UART detection more specific
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/include/debug/vexpress.S | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S index 9f509f55d078..0c6abbf4c82b 100644 --- a/arch/arm/include/debug/vexpress.S +++ b/arch/arm/include/debug/vexpress.S @@ -23,12 +23,14 @@ .macro addruart,rp,rv,tmp @ Make an educated guess regarding the memory map: - @ - the original A9 core tile, which has MPCore peripherals - @ located at 0x1e000000, should use UART at 0x10009000 + @ - the original A9 core tile (based on ARM Cortex-A9 r0p1) + @ should use UART at 0x10009000 @ - all other (RS1 complaint) tiles use UART mapped @ at 0x1c090000 - mrc p15, 4, \tmp, c15, c0, 0 - cmp \tmp, #0x1e000000 + mrc p15, 0, \rp, c0, c0, 0 + movw \rv, #0xc091 + movt \rv, #0x410f + cmp \rp, \rv @ Original memory map moveq \rp, #DEBUG_LL_UART_OFFSET |
