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

Commit 69b78b8d authored by Linus Walleij's avatar Linus Walleij
Browse files

pinctrl: msm: move all qualcomm drivers to subdir 



We have four Qualcomm-related pin control drivers, and now there
are drivers coming in for the PMICs on these systems, so let's
create a qcom subdirectory to hold all the Qualcomm stuff.

Acked-by: default avatarIvan T. Ivanov <iivanov@mm-sol.com>
Acked-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 14d40ff8

drivers/pinctrl/Kconfig

+1 −39
Original line number Diff line number Diff line
@@ -233,45 +233,6 @@ config PINCTRL_IMX28 
	bool

	select PINCTRL_MXS



config PINCTRL_MSM

	bool

	select PINMUX

	select PINCONF

	select GENERIC_PINCONF

	select GPIOLIB_IRQCHIP



config PINCTRL_APQ8064

	tristate "Qualcomm APQ8064 pin controller driver"

	depends on GPIOLIB && OF

	select PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm APQ8064 platform.



config PINCTRL_IPQ8064

	tristate "Qualcomm IPQ8064 pin controller driver"

	depends on GPIOLIB && OF

	select PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm IPQ8064 platform.



config PINCTRL_MSM8960

	tristate "Qualcomm 8960 pin controller driver"

	depends on GPIOLIB && OF

	select PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm 8960 platform.



config PINCTRL_MSM8X74

	tristate "Qualcomm 8x74 pin controller driver"

	depends on GPIOLIB && OF && (ARCH_QCOM || COMPILE_TEST)

	select PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm 8974 platform.



config PINCTRL_NOMADIK

	bool "Nomadik pin controller driver"

	depends on ARCH_U8500 || ARCH_NOMADIK
@@ -410,6 +371,7 @@ config PINCTRL_S3C64XX 


source "drivers/pinctrl/berlin/Kconfig"

source "drivers/pinctrl/mvebu/Kconfig"

source "drivers/pinctrl/qcom/Kconfig"

source "drivers/pinctrl/sh-pfc/Kconfig"

source "drivers/pinctrl/spear/Kconfig"

source "drivers/pinctrl/sunxi/Kconfig"

drivers/pinctrl/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -39,11 +39,6 @@ obj-$(CONFIG_PINCTRL_MXS) += pinctrl-mxs.o 
obj-$(CONFIG_PINCTRL_IMX23)	+= pinctrl-imx23.o

obj-$(CONFIG_PINCTRL_IMX25)	+= pinctrl-imx25.o

obj-$(CONFIG_PINCTRL_IMX28)	+= pinctrl-imx28.o

obj-$(CONFIG_PINCTRL_MSM)	+= pinctrl-msm.o

obj-$(CONFIG_PINCTRL_APQ8064)	+= pinctrl-apq8064.o

obj-$(CONFIG_PINCTRL_IPQ8064)	+= pinctrl-ipq8064.o

obj-$(CONFIG_PINCTRL_MSM8960)	+= pinctrl-msm8960.o

obj-$(CONFIG_PINCTRL_MSM8X74)	+= pinctrl-msm8x74.o

obj-$(CONFIG_PINCTRL_NOMADIK)	+= pinctrl-nomadik.o

obj-$(CONFIG_PINCTRL_STN8815)	+= pinctrl-nomadik-stn8815.o

obj-$(CONFIG_PINCTRL_DB8500)	+= pinctrl-nomadik-db8500.o
@@ -74,6 +69,7 @@ obj-$(CONFIG_PINCTRL_VF610) += pinctrl-vf610.o 


obj-$(CONFIG_ARCH_BERLIN)	+= berlin/

obj-$(CONFIG_PLAT_ORION)        += mvebu/

obj-$(CONFIG_ARCH_QCOM)		+= qcom/

obj-$(CONFIG_ARCH_SHMOBILE)	+= sh-pfc/

obj-$(CONFIG_SUPERH)		+= sh-pfc/

obj-$(CONFIG_PLAT_SPEAR)	+= spear/

drivers/pinctrl/qcom/Kconfig

0 → 100644
+42 −0
Original line number Diff line number Diff line 
if (ARCH_QCOM || COMPILE_TEST)



config PINCTRL_MSM

	bool

	select PINMUX

	select PINCONF

	select GENERIC_PINCONF

	select GPIOLIB_IRQCHIP



config PINCTRL_APQ8064

	tristate "Qualcomm APQ8064 pin controller driver"

	depends on GPIOLIB && OF

	select PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm APQ8064 platform.



config PINCTRL_IPQ8064

	tristate "Qualcomm IPQ8064 pin controller driver"

	depends on GPIOLIB && OF

	select PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm IPQ8064 platform.



config PINCTRL_MSM8960

	tristate "Qualcomm 8960 pin controller driver"

	depends on GPIOLIB && OF

	select PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm 8960 platform.



config PINCTRL_MSM8X74

	tristate "Qualcomm 8x74 pin controller driver"

	depends on GPIOLIB && OF

	select PINCTRL_MSM

	help

	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm 8974 platform.



endif

drivers/pinctrl/qcom/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# Qualcomm pin control drivers

obj-$(CONFIG_PINCTRL_MSM)	+= pinctrl-msm.o

obj-$(CONFIG_PINCTRL_APQ8064)	+= pinctrl-apq8064.o

obj-$(CONFIG_PINCTRL_IPQ8064)	+= pinctrl-ipq8064.o

obj-$(CONFIG_PINCTRL_MSM8960)	+= pinctrl-msm8960.o

obj-$(CONFIG_PINCTRL_MSM8X74)	+= pinctrl-msm8x74.o