Merge tag 'qcom-soc-for-3.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

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>

diff --combined arch/arm/Kconfig.debug
index 6ff3dc661fdde495ab910800b8c6a1ae48cff54d,158b72c7d6f6079f4e75829a97499361a1ccc95e..149d1f02ea233e4c646711951d479987b7f840fd
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -317,13 -317,6 +317,13 @@@ choic
                  Say Y here if you want kernel low-level debugging support
                  on i.MX6SL.
  
 +      config DEBUG_IMX6SX_UART
 +              bool "i.MX6SX Debug UART"
 +              depends on SOC_IMX6SX
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on i.MX6SX.
 +
        config DEBUG_KEYSTONE_UART0
                bool "Kernel low-level debugging on KEYSTONE2 using UART0"
                depends on ARCH_KEYSTONE
@@@ -383,6 -376,7 +383,7 @@@
                  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
@@@ -925,23 -919,13 +926,23 @@@ config DEBUG_IMX_UART_POR
                                                DEBUG_IMX51_UART || \
                                                DEBUG_IMX53_UART || \
                                                DEBUG_IMX6Q_UART || \
 -                                              DEBUG_IMX6SL_UART
 +                                              DEBUG_IMX6SL_UART || \
 +                                              DEBUG_IMX6SX_UART
        default 1
        depends on ARCH_MXC
        help
          Choose UART port on which kernel low-level debug messages
          should be output.
  
 +config DEBUG_VF_UART_PORT
 +      int "Vybrid Debug UART Port Selection" if DEBUG_VF_UART
 +      default 1
 +      range 0 3
 +      depends on SOC_VF610
 +      help
 +        Choose UART port on which kernel low-level debug messages
 +        should be output.
 +
  config DEBUG_TEGRA_UART
        bool
        depends on ARCH_TEGRA
@@@ -966,8 -950,7 +967,8 @@@ config DEBUG_LL_INCLUD
                                 DEBUG_IMX51_UART || \
                                 DEBUG_IMX53_UART ||\
                                 DEBUG_IMX6Q_UART || \
 -                               DEBUG_IMX6SL_UART
 +                               DEBUG_IMX6SL_UART || \
 +                               DEBUG_IMX6SX_UART
        default "debug/msm.S" if DEBUG_MSM_UART || DEBUG_QCOM_UARTDM
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
        default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
@@@ -1027,9 -1010,9 +1028,9 @@@ config DEBUG_UART_PHY
        default 0x40100000 if DEBUG_PXA_UART1
        default 0x42000000 if ARCH_GEMINI
        default 0x7c0003f8 if FOOTBRIDGE
 -      default 0x80230000 if DEBUG_PICOXCELL_UART
        default 0x80070000 if DEBUG_IMX23_UART
        default 0x80074000 if DEBUG_IMX28_UART
 +      default 0x80230000 if DEBUG_PICOXCELL_UART
        default 0x808c0000 if ARCH_EP93XX
        default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
        default 0xa9a00000 if DEBUG_MSM_UART
@@@ -1098,22 -1081,22 +1099,22 @@@ config DEBUG_UART_VIR
        default 0xfeb26000 if DEBUG_RK3X_UART1
        default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
        default 0xfeb31000 if DEBUG_KEYSTONE_UART1
 -      default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
 -      default 0xfed60000 if DEBUG_RK29_UART0
 -      default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
 -      default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
        default 0xfec02000 if DEBUG_SOCFPGA_UART
 +      default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
        default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
        default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
        default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
        default 0xfed12000 if ARCH_KIRKWOOD
 +      default 0xfed60000 if DEBUG_RK29_UART0
 +      default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
 +      default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
        default 0xfedc0000 if ARCH_EP93XX
        default 0xfee003f8 if FOOTBRIDGE
        default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
 -      default 0xfef36000 if DEBUG_HIGHBANK_UART
        default 0xfee82340 if ARCH_IOP13XX
        default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
        default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
 +      default 0xfef36000 if DEBUG_HIGHBANK_UART
        default 0xfefff700 if ARCH_IOP33X
        default 0xff003000 if DEBUG_U300_UART
        default DEBUG_UART_PHYS if !MMU