Merge tag 'qcom-cleanup-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/cleanup

Merge "qcom cleanup changes for 4.1" from Kumar Gala:

General cleanups for MSM/QCOM for 4.1

* Removal of mach-msm and associated drivers cleanups that have been
  ack'd by associated maintainers

* tag 'qcom-cleanup-for-4.1' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  mmc: Remove msm_sdcc driver
  gpio: Remove gpio-msm-v1 driver
  ARM: Remove mach-msm and associated ARM architecture code
  + Linux 4.0-rc3

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 0 insertions, 14 deletions

diff --git a/arch/arm/include/debug/msm.S b/arch/arm/include/debug/msm.S
index e55a9426b496..b03024fa671f 100644
--- a/arch/arm/include/debug/msm.S
+++ b/arch/arm/include/debug/msm.S
@@ -16,24 +16,17 @@
  */
 
         .macro  addruart, rp, rv, tmp
-#ifdef CONFIG_DEBUG_UART_PHYS
         ldr     \rp, =CONFIG_DEBUG_UART_PHYS
         ldr     \rv, =CONFIG_DEBUG_UART_VIRT
-#endif
         .endm
 
         .macro  senduart, rd, rx
 ARM_BE8(rev     \rd, \rd )
-#ifdef CONFIG_DEBUG_QCOM_UARTDM
         @ Write the 1 character to UARTDM_TF
         str     \rd, [\rx, #0x70]
-#else
-        str     \rd, [\rx, #0x0C]
-#endif
         .endm
 
         .macro  waituart, rd, rx
-#ifdef CONFIG_DEBUG_QCOM_UARTDM
         @ check for TX_EMT in UARTDM_SR
         ldr     \rd, [\rx, #0x08]
 ARM_BE8(rev     \rd, \rd )
@@ -55,13 +48,6 @@ ARM_BE8(rev     \rd, \rd )
         str     \rd, [\rx, #0x40]
         @ UARTDM reg. Read to induce delay
         ldr     \rd, [\rx, #0x08]
-#else
-        @ wait for TX_READY
-1001:   ldr     \rd, [\rx, #0x08]
-ARM_BE8(rev     \rd, \rd )
-        tst     \rd, #0x04
-        beq     1001b
-#endif
         .endm
 
         .macro  busyuart, rd, rx