summaryrefslogtreecommitdiff
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2011-12-05 10:27:42 -0800
committerDavid Brown <davidb@codeaurora.org>2012-05-11 11:08:34 -0700
commitc97d9320c669d63b8c0bcd1c1b203af98d8aa34e (patch)
tree9993a827266dac4305bdfdf8c5640e51e0fdd04a /arch/arm/mach-msm
parent0034102808e0dbbf3a2394b82b1bb40b5778de9e (diff)
downloadlinux-3.10-c97d9320c669d63b8c0bcd1c1b203af98d8aa34e.tar.gz
linux-3.10-c97d9320c669d63b8c0bcd1c1b203af98d8aa34e.tar.bz2
linux-3.10-c97d9320c669d63b8c0bcd1c1b203af98d8aa34e.zip
ARM: msm: Drop useless teq from DEBUG_LL support
This teq was first introduced in bcc0f6a ([ARM] msm: clean up iomap and devices, 2008-09-10). It seems that DEBUG_LL support on MSM at the time had to remove the virtual mapping for the uart base. Thus when the MMU was enabled the addruart macro returned 0 and the senduart macro would test for 0 and do nothing. It was a simple way to turn off DEBUG_LL when the MMU was enabled. The virtual mapping was added back in 6339f66 (msm: make debugging UART (for DEBUG_LL) configurable, 2009-11-02) but the patch forgot to remove the teq here. So as it stands the teq has been useless for two years and DEBUG_LL works fine without it. Cc: Nicolas Pitre <nico@fluxnic.net> Signed-off-by: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: David Brown <davidb@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/include/mach/debug-macro.S3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/mach-msm/include/mach/debug-macro.S
index 3ffd8668c9a..0e05f88abcd 100644
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/mach-msm/include/mach/debug-macro.S
@@ -30,8 +30,7 @@
@ Write the 1 character to UARTDM_TF
str \rd, [\rx, #0x70]
#else
- teq \rx, #0
- strne \rd, [\rx, #0x0C]
+ str \rd, [\rx, #0x0C]
#endif
.endm