summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2014-05-30 20:34:23 -0700
committerOlof Johansson <olof@lixom.net>2014-05-30 20:34:23 -0700
commitb4c48e8780325e1f2ba79ccc0fb2a6c99c7cfac2 (patch)
tree6c7d1d5f5277a8c115c3c8418e080c438c7bb646 /arch/arm
parent7db76c4154a3633577903b171e3ddb484498df85 (diff)
parent2f528dd3b30c4351c0ece73b8bdc39753c02003b (diff)
Merge tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/soc
Merge "Qualcomm ARM Based SoC Updates for v3.16-2" from Kumar Gala: * Updated Kconfig DEBUG_QCOM_UARTDM help to include APQ8084 info * tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom: ARM: debug: qcom: add UART addresses to Kconfig help for APQ8084 Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig.debug1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 6ff3dc661fd..149d1f02ea2 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -383,6 +383,7 @@ choice
their output to the serial port on Qualcomm devices.
ARCH DEBUG_UART_PHYS DEBUG_UART_BASE
+ APQ8084 0xf995e000 0xfa75e000
MSM8X60 0x19c40000 0xf0040000
MSM8960 0x16440000 0xf0040000
MSM8974 0xf991e000 0xfa71e000