Merge tag 'qcom-drivers-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom into next/drivers

Merge "qcom driver changes for v3.15" from Kumar Gala:

We've split Qualcomm MSM support into legacy and multiplatform.  These
drivers are only relevant on the multiplatform supported SoCs so switch the
Kconfig depends to ARCH_QCOM.

* tag 'qcom-drivers-for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom:
  gpio: msm: switch Kconfig to ARCH_QCOM depends
  hwrng: msm: switch Kconfig to ARCH_QCOM depends
  power: reset: msm - switch Kconfig to ARCH_QCOM depends
  drm/msm: drop ARCH_MSM Kconfig depend
  tty: serial: msm: Enable building msm_serial for ARCH_QCOM

5 files changed, 7 insertions, 7 deletions

diff --git a/drivers/char/hw_random/Kconfig b/drivers/char/hw_random/Kconfig
index 2f2b08457c67..244759bbd7b7 100644
--- a/drivers/char/hw_random/Kconfig
+++ b/drivers/char/hw_random/Kconfig
@@ -342,11 +342,11 @@ config HW_RANDOM_TPM
           If unsure, say Y.
 
 config HW_RANDOM_MSM
-        tristate "Qualcomm MSM Random Number Generator support"
-        depends on HW_RANDOM && ARCH_MSM
+        tristate "Qualcomm SoCs Random Number Generator support"
+        depends on HW_RANDOM && ARCH_QCOM
         ---help---
           This driver provides kernel-side support for the Random Number
-          Generator hardware found on Qualcomm MSM SoCs.
+          Generator hardware found on Qualcomm SoCs.
 
           To compile this driver as a module, choose M here. the
           module will be called msm-rng.
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 903f24d28ba0..2c38d950a1e5 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -192,7 +192,7 @@ config GPIO_MSM_V1
 
 config GPIO_MSM_V2
         tristate "Qualcomm MSM GPIO v2"
-        depends on GPIOLIB && OF && ARCH_MSM
+        depends on GPIOLIB && OF && ARCH_QCOM
         help
           Say yes here to support the GPIO interface on ARM v7 based
           Qualcomm MSM chips.  Most of the pins on the MSM can be
diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index c69d1e07a3a6..b6984971ce0c 100644
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -3,7 +3,7 @@ config DRM_MSM
         tristate "MSM DRM"
         depends on DRM
         depends on MSM_IOMMU
-        depends on (ARCH_MSM && ARCH_MSM8960) || (ARM && COMPILE_TEST)
+        depends on ARCH_MSM8960 || (ARM && COMPILE_TEST)
         select DRM_KMS_HELPER
         select SHMEM
         select TMPFS
diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig
index 6d452a78b19c..fa0e4e057b99 100644
--- a/drivers/power/reset/Kconfig
+++ b/drivers/power/reset/Kconfig
@@ -22,7 +22,7 @@ config POWER_RESET_GPIO
 
 config POWER_RESET_MSM
         bool "Qualcomm MSM power-off driver"
-        depends on POWER_RESET && ARCH_MSM
+        depends on POWER_RESET && ARCH_QCOM
         help
           Power off and restart support for Qualcomm boards.
 
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index a3815eaed421..ce9b12d38786 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1024,7 +1024,7 @@ config SERIAL_SGI_IOC3
 
 config SERIAL_MSM
         bool "MSM on-chip serial port support"
-        depends on ARCH_MSM
+        depends on ARCH_MSM || ARCH_QCOM
         select SERIAL_CORE
 
 config SERIAL_MSM_CONSOLE