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

Commit 077efb5b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: bengal: Enable scuba pinctrl"

parents 87e3b339 2c33d941

arch/arm64/configs/vendor/bengal_defconfig

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

CONFIG_PINCTRL_QCOM_SPMI_PMIC=y

CONFIG_PINCTRL_BENGAL=y

CONFIG_PINCTRL_SCUBA=y

CONFIG_GPIO_SYSFS=y

CONFIG_POWER_RESET_QCOM=y

CONFIG_POWER_RESET_XGENE=y

drivers/pinctrl/qcom/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -192,4 +192,13 @@ config PINCTRL_BENGAL 
	  Qualcomm Technologies Inc TLMM block found on the Qualcomm

	  Technologies Inc BENGAL platform.



config PINCTRL_SCUBA

	tristate "Qualcomm Technologies Inc SCUBA 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 SCUBA platform.



endif

drivers/pinctrl/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ obj-$(CONFIG_PINCTRL_KONA) += pinctrl-kona.o 
obj-$(CONFIG_PINCTRL_LITO) += pinctrl-lito.o

obj-$(CONFIG_PINCTRL_BENGAL) += pinctrl-bengal.o

obj-$(CONFIG_PINCTRL_LAGOON) += pinctrl-lagoon.o

obj-$(CONFIG_PINCTRL_SCUBA) += pinctrl-scuba.o