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

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

Merge "defconfig: msm: enable PINCTRL_MSM8917 support for msm8917"

parents d7bdf851 e1e5a155

arch/arm64/configs/msm8953-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -311,6 +311,7 @@ CONFIG_SPMI=y 
CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_PINCTRL_MSM8953=y

CONFIG_PINCTRL_MSM8953=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIOLIB=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y

arch/arm64/configs/msm8953_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -323,6 +323,7 @@ CONFIG_SPMI=y 
CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_SPMI_MSM_PMIC_ARB_DEBUG=y

CONFIG_PINCTRL_MSM8953=y

CONFIG_PINCTRL_MSM8953=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8937=y

CONFIG_PINCTRL_MSM8917=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_GPIOLIB=y

CONFIG_GPIOLIB=y

CONFIG_GPIO_SYSFS=y

CONFIG_GPIO_SYSFS=y

drivers/pinctrl/qcom/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -109,6 +109,16 @@ config PINCTRL_MSM8937 
	  Technologies Inc MSM8937 platform.

	  Technologies Inc MSM8937 platform.

	  If unsure say N.

	  If unsure say N.





config PINCTRL_MSM8917

	tristate "Qualcomm Technologies Inc MSM8917 pin controller driver"

	depends on GPIOLIB && OF

	select PINCTRL_MSM

	help

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

	  Qualcomm Technologies Inc TLMM block found on the Qualcomm

	  Technologies Inc MSM8917 platform.

	  If unsure say N.



config PINCTRL_SDM845

config PINCTRL_SDM845

	tristate "Qualcomm Technologies Inc SDM845 pin controller driver"

	tristate "Qualcomm Technologies Inc SDM845 pin controller driver"

	depends on GPIOLIB && OF

	depends on GPIOLIB && OF

drivers/pinctrl/qcom/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_PINCTRL_MDM9615) += pinctrl-mdm9615.o 
obj-$(CONFIG_PINCTRL_MSM8953)   += pinctrl-msm8953.o

obj-$(CONFIG_PINCTRL_MSM8953)   += pinctrl-msm8953.o

obj-$(CONFIG_PINCTRL_MSM8909)   += pinctrl-msm8909.o

obj-$(CONFIG_PINCTRL_MSM8909)   += pinctrl-msm8909.o

obj-$(CONFIG_PINCTRL_MSM8937)   += pinctrl-msm8937.o

obj-$(CONFIG_PINCTRL_MSM8937)   += pinctrl-msm8937.o

obj-$(CONFIG_PINCTRL_MSM8917)   += pinctrl-msm8917.o

obj-$(CONFIG_PINCTRL_QCOM_SPMI_PMIC) += pinctrl-spmi-gpio.o

obj-$(CONFIG_PINCTRL_QCOM_SPMI_PMIC) += pinctrl-spmi-gpio.o

obj-$(CONFIG_PINCTRL_QCOM_SPMI_PMIC) += pinctrl-spmi-mpp.o

obj-$(CONFIG_PINCTRL_QCOM_SPMI_PMIC) += pinctrl-spmi-mpp.o

obj-$(CONFIG_PINCTRL_QCOM_SSBI_PMIC) += pinctrl-ssbi-gpio.o

obj-$(CONFIG_PINCTRL_QCOM_SSBI_PMIC) += pinctrl-ssbi-gpio.o

drivers/pinctrl/qcom/pinctrl-msm8917.c

0 → 100644
+1474 −0

File added.

Preview size limit exceeded, changes collapsed.