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

Commit 34b16f74 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Qualcomm ARM Based driver Updates for v3.16

* Introduce drivers/soc directory for misc SoC specific code
* Add driver to configure GSBI device

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

:
  soc: qcom: Add GSBI driver
  soc: Introduce drivers/soc place-holder for SOC specific drivers

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents efca0a3e 5d144e36

drivers/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -132,6 +132,8 @@ source "drivers/staging/Kconfig" 




source "drivers/platform/Kconfig"

source "drivers/platform/Kconfig"





source "drivers/soc/Kconfig"



source "drivers/clk/Kconfig"

source "drivers/clk/Kconfig"





source "drivers/hwspinlock/Kconfig"

source "drivers/hwspinlock/Kconfig"

drivers/Makefile

+3 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,9 @@ obj-y += amba/ 
# really early.

# really early.

obj-$(CONFIG_DMADEVICES)	+= dma/

obj-$(CONFIG_DMADEVICES)	+= dma/





# SOC specific infrastructure drivers.

obj-y				+= soc/



obj-$(CONFIG_VIRTIO)		+= virtio/

obj-$(CONFIG_VIRTIO)		+= virtio/

obj-$(CONFIG_XEN)		+= xen/

obj-$(CONFIG_XEN)		+= xen/

drivers/soc/Kconfig

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
menu "SOC (System On Chip) specific Drivers"



source "drivers/soc/qcom/Kconfig"



endmenu

drivers/soc/Makefile

0 → 100644
+5 −0
Original line number Original line Diff line number Diff line 
#

# Makefile for the Linux Kernel SOC specific device drivers.

#



obj-$(CONFIG_ARCH_QCOM)		+= qcom/

drivers/soc/qcom/Kconfig

0 → 100644
+11 −0
Original line number Original line Diff line number Diff line 
#

# QCOM Soc drivers

#

config QCOM_GSBI

        tristate "QCOM General Serial Bus Interface"

        depends on ARCH_QCOM

        help

          Say y here to enable GSBI support.  The GSBI provides control

          functions for connecting the underlying serial UART, SPI, and I2C

          devices to the output pins.