Commit b4c48e87 authored May 30, 2014 by Olof Johansson

Merge tag 'qcom-soc-for-3.16-2' of...

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>

parents 7db76c41 2f528dd3

arch/arm/Kconfig.debug

+1 −0

Original line number	Diff line number	Diff line
		@@ -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