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

Commit aa9a5fc5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm64: msmcortex_defconfig: enable support for MSMTHORIUM and PINCTRL"

parents 2ead4715 3c7a3a53

arch/arm64/configs/msmcortex_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ CONFIG_PARTITION_ADVANCED=y 
CONFIG_ARCH_MSM=y

CONFIG_ARCH_MSM8916=y

CONFIG_ARCH_MSMTITANIUM=y

CONFIG_ARCH_MSMTHORIUM=y

CONFIG_PCI_MSM=y

CONFIG_ARM64_STLR_NEEDS_BARRIER=y

CONFIG_SMP=y
@@ -265,6 +266,7 @@ CONFIG_SPI=y 
CONFIG_SPI_QUP=y

CONFIG_SPI_SPIDEV=m

CONFIG_PINCTRL_MSM8952=y

CONFIG_PINCTRL_MSMTHORIUM=y

CONFIG_PINCTRL_MSMTITANIUM=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_QPNP_PIN=y

drivers/pinctrl/qcom/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -87,6 +87,14 @@ config PINCTRL_MSM8952 
	  This is the pinctrl, pinmux, pinconf and gpiolib driver for the

	  Qualcomm TLMM block found in the Qualcomm MSM8952 platform.



config PINCTRL_MSMTHORIUM

	tristate "QTI MSMTHORIUM pin controller driver"

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

	select PINCTRL_MSM

	help

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

	  QTI TLMM block found in the QTI MSMTHORIUM platform.



config PINCTRL_MSMTITANIUM

	tristate "Qualcomm MSMTITANIUM pin controller driver"

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

drivers/pinctrl/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ obj-$(CONFIG_PINCTRL_MSM8960) += pinctrl-msm8960.o 
obj-$(CONFIG_PINCTRL_MSM8X74)	+= pinctrl-msm8x74.o

obj-$(CONFIG_PINCTRL_MSM8996)	+= pinctrl-msm8996.o

obj-$(CONFIG_PINCTRL_MSM8952)	+= pinctrl-msm8952.o

obj-$(CONFIG_PINCTRL_MSMTHORIUM)	+= pinctrl-msmthorium.o

obj-$(CONFIG_PINCTRL_MSMTITANIUM)	+= pinctrl-msmtitanium.o

obj-$(CONFIG_PINCTRL_MDMFERMIUM)	+= pinctrl-mdmfermium.o

obj-$(CONFIG_PINCTRL_MDMCALIFORNIUM)   += pinctrl-mdmcalifornium.o

drivers/pinctrl/qcom/pinctrl-msmthorium.c

0 → 100644
+1473 −0

File added.

Preview size limit exceeded, changes collapsed.