diff options
| author | Thomas Abraham <thomas.ab@samsung.com> | 2011-03-25 03:18:18 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-28 03:17:54 -0400 |
| commit | b9ab19f936e823c31e66702ee553e4d18e910c9a (patch) | |
| tree | 82e998836ddacf4c616b9025098d0e0413e67787 /arch/arm/mach-exynos4 | |
| parent | 1af3c67212d1694977b6da47b4451a9b019e7606 (diff) | |
ARM: EXYNOS4: Fix addruart macro
Fix incorrect conditional execution of ldr instructions in
addruart macro.
Signed-off-by: Thomas Abraham <thomas.abraham@samsung.com>
Signed-off-by: Abhilash Kesavan <a.kesavan@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Diffstat (limited to 'arch/arm/mach-exynos4')
| -rw-r--r-- | arch/arm/mach-exynos4/include/mach/debug-macro.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-exynos4/include/mach/debug-macro.S b/arch/arm/mach-exynos4/include/mach/debug-macro.S index 58bbd049a6c4..a442ef861167 100644 --- a/arch/arm/mach-exynos4/include/mach/debug-macro.S +++ b/arch/arm/mach-exynos4/include/mach/debug-macro.S | |||
| @@ -21,8 +21,8 @@ | |||
| 21 | */ | 21 | */ |
| 22 | 22 | ||
| 23 | .macro addruart, rp, rv | 23 | .macro addruart, rp, rv |
| 24 | ldreq \rp, = S3C_PA_UART | 24 | ldr \rp, = S3C_PA_UART |
| 25 | ldrne \rv, = S3C_VA_UART | 25 | ldr \rv, = S3C_VA_UART |
| 26 | #if CONFIG_DEBUG_S3C_UART != 0 | 26 | #if CONFIG_DEBUG_S3C_UART != 0 |
| 27 | add \rp, \rp, #(0x10000 * CONFIG_DEBUG_S3C_UART) | 27 | add \rp, \rp, #(0x10000 * CONFIG_DEBUG_S3C_UART) |
| 28 | add \rv, \rv, #(0x10000 * CONFIG_DEBUG_S3C_UART) | 28 | add \rv, \rv, #(0x10000 * CONFIG_DEBUG_S3C_UART) |