From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 23 May 2014 19:32:29 +0000 (+0200)
Subject: Merge tag 'qcom-soc-for-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/galak... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8ad0bbd8696904c34a1fb266a25efe2be818c0c7;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'qcom-soc-for-3.16' of git://git./linux/kernel/git/galak/linux-qcom into next/soc

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>
---

8ad0bbd8696904c34a1fb266a25efe2be818c0c7
diff --cc arch/arm/Kconfig.debug
index 4dd565f84f6f,cdbfd8b0efc7..6ff3dc661fdd
--- a/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 6aa22147cace,63502cc57f9e..fd2b99dceb89
--- a/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.