Skip to content

Commit

Permalink
Merge tag 'qcom-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/git/agross/linux into next/soc

Qualcomm ARM Based SoC Updates for v4.13

* Add debug UART addresses for IPQ4019

* tag 'qcom-soc-for-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/agross/linux:
  ARM: debug: qcom: add UART addresses to Kconfig help for IPQ4019

Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Olof Johansson committed Jun 19, 2017
2 parents f7b2211 + 7b87fe9 commit 6a5ba72
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,7 @@ choice
ARCH DEBUG_UART_PHYS DEBUG_UART_VIRT
APQ8064 0x16640000 0xf0040000
APQ8084 0xf995e000 0xfa75e000
IPQ4019 0x078af000 0xf78af000
MSM8X60 0x19c40000 0xf0040000
MSM8960 0x16440000 0xf0040000
MSM8974 0xf991e000 0xfa71e000
Expand Down

0 comments on commit 6a5ba72

Please sign in to comment.