Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 23453853 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-drivers-for-3.15' of... 

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
parents f1a0d58e add798a4

drivers/char/hw_random/Kconfig

+3 −3
Original line number Original line Diff line number Diff line
@@ -342,11 +342,11 @@ config HW_RANDOM_TPM 
	  If unsure, say Y.

	  If unsure, say Y.





config HW_RANDOM_MSM

config HW_RANDOM_MSM

	tristate "Qualcomm MSM Random Number Generator support"

	tristate "Qualcomm SoCs Random Number Generator support"

	depends on HW_RANDOM && ARCH_MSM

	depends on HW_RANDOM && ARCH_QCOM

	---help---

	---help---

	  This driver provides kernel-side support for the Random Number

	  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

	  To compile this driver as a module, choose M here. the

	  module will be called msm-rng.

	  module will be called msm-rng.

drivers/gpio/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -192,7 +192,7 @@ config GPIO_MSM_V1 




config GPIO_MSM_V2

config GPIO_MSM_V2

	tristate "Qualcomm MSM GPIO v2"

	tristate "Qualcomm MSM GPIO v2"

	depends on GPIOLIB && OF && ARCH_MSM

	depends on GPIOLIB && OF && ARCH_QCOM

	help

	help

	  Say yes here to support the GPIO interface on ARM v7 based

	  Say yes here to support the GPIO interface on ARM v7 based

	  Qualcomm MSM chips.  Most of the pins on the MSM can be

	  Qualcomm MSM chips.  Most of the pins on the MSM can be

drivers/gpu/drm/msm/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -3,7 +3,7 @@ config DRM_MSM 
	tristate "MSM DRM"

	tristate "MSM DRM"

	depends on DRM

	depends on DRM

	depends on MSM_IOMMU

	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 DRM_KMS_HELPER

	select SHMEM

	select SHMEM

	select TMPFS

	select TMPFS

drivers/power/reset/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -22,7 +22,7 @@ config POWER_RESET_GPIO 




config POWER_RESET_MSM

config POWER_RESET_MSM

	bool "Qualcomm MSM power-off driver"

	bool "Qualcomm MSM power-off driver"

	depends on POWER_RESET && ARCH_MSM

	depends on POWER_RESET && ARCH_QCOM

	help

	help

	  Power off and restart support for Qualcomm boards.

	  Power off and restart support for Qualcomm boards.

drivers/tty/serial/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -1024,7 +1024,7 @@ config SERIAL_SGI_IOC3 




config SERIAL_MSM

config SERIAL_MSM

	bool "MSM on-chip serial port support"

	bool "MSM on-chip serial port support"

	depends on ARCH_MSM

	depends on ARCH_MSM || ARCH_QCOM

	select SERIAL_CORE

	select SERIAL_CORE





config SERIAL_MSM_CONSOLE

config SERIAL_MSM_CONSOLE