diff options
| author | Olof Johansson <olof@lixom.net> | 2012-04-05 10:49:45 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-04-05 10:49:45 -0700 |
| commit | 00bd60fe33f3b9e0d790a5e3eebbaa50ac89ead2 (patch) | |
| tree | 706e9db7d0a45fd75d03d72ab568d6b7d44287b7 /arch/arm/mach-exynos/include/mach/debug-macro.S | |
| parent | 57b501bdceca328bb500d87587b440194ef15e8d (diff) | |
| parent | f011fd164801cd8dd151268ae7adbadef0e3e301 (diff) | |
| download | linux-00bd60fe33f3b9e0d790a5e3eebbaa50ac89ead2.tar.gz linux-00bd60fe33f3b9e0d790a5e3eebbaa50ac89ead2.tar.bz2 linux-00bd60fe33f3b9e0d790a5e3eebbaa50ac89ead2.zip | |
Merge branch 'v3.4-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.4-samsung-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Fix compiler warning in dma.c file
ARM: EXYNOS: fix ISO C90 warning
ARM: EXYNOS: use chip_id reg in uncompress to select uart base phys
ARM: EXYNOS: fix CONFIG_DEBUG_LL
ARM: S3C24XX: fix missing common.h in mach-s3c24xx/
Diffstat (limited to 'arch/arm/mach-exynos/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-exynos/include/mach/debug-macro.S | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-exynos/include/mach/debug-macro.S b/arch/arm/mach-exynos/include/mach/debug-macro.S index 6c857ff0b5d8..e0c86ea475e7 100644 --- a/arch/arm/mach-exynos/include/mach/debug-macro.S +++ b/arch/arm/mach-exynos/include/mach/debug-macro.S @@ -21,10 +21,9 @@ */ .macro addruart, rp, rv, tmp - mov \rp, #0x10000000 - ldr \rp, [\rp, #0x0] - and \rp, \rp, #0xf00000 - teq \rp, #0x500000 @@ EXYNOS5 + mrc p15, 0, \tmp, c0, c0, 0 + and \tmp, \tmp, #0xf0 + teq \tmp, #0xf0 @@ A15 ldreq \rp, =EXYNOS5_PA_UART movne \rp, #EXYNOS4_PA_UART @@ EXYNOS4 ldr \rv, =S3C_VA_UART |