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

Merge "Qualcomm ARM Based SoC Updates for v3.16" from Kumar Gala:

* Enabling building pinctrl and AMBA bus support
* Clean up debug UART selection

* tag 'qcom-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  ARM: qcom: Select PINCTRL by default for ARCH_QCOM
  ARM: debug: qcom: make UART address selection configuration option
  ARM: qcom: Enable ARM_AMBA option for Qualcomm SOCs.

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/mach-qcom/Kconfig

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/Kconfig.debug
index 4dd565f84f6fa522d9192847194672cb2aa65492,cdbfd8b0efc77c55088a4bdbef1a547e8d03710d..6ff3dc661fdde495ab910800b8c6a1ae48cff54d
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -987,9 -949,8 +966,9 @@@ 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
+       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
        default "debug/sti.S" if DEBUG_STI_UART
@@@ -1048,11 -1009,12 +1027,12 @@@ 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
        default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
        default 0xc0013000 if DEBUG_U300_UART
        default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN

diff --cc arch/arm/mach-qcom/Kconfig
index 6aa22147cace9c89c1dae3edc28e99d4fa5a913c,63502cc57f9e15798c38701a57d56220d6671e59..fd2b99dceb895b32758b638b958779dccff11965
--- 1/arch/arm/mach-qcom/Kconfig
--- 2/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@@ -2,7 -2,11 +2,9 @@@ config ARCH_QCO
        bool "Qualcomm Support" if ARCH_MULTI_V7
        select ARCH_REQUIRE_GPIOLIB
        select ARM_GIC
+       select ARM_AMBA
        select CLKSRC_OF
 -      select GENERIC_CLOCKEVENTS
 -      select HAVE_SMP
+       select PINCTRL
        select QCOM_SCM if SMP
        help
          Support for Qualcomm's devicetree based systems.