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

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

Merge "mfd: wcd9xxx: Combine all codec configs into single config"

parents e00e96c3 4b8306d8

drivers/mfd/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ wcd-core-objs := wcd9xxx-rst.o wcd9xxx-core-init.o \ 
				   wcd934x-regmap.o wcd934x-tables.o \

				   wcd9335-regmap.o wcd9335-tables.o \

				   msm-cdc-pinctrl.o msm-cdc-supply.o

obj-$(CONFIG_WCD934X_CODEC)	+= wcd-core.o

obj-$(CONFIG_WCD9XXX_CODEC_CORE) += wcd-core.o

intel-soc-pmic-objs		:= intel_soc_pmic_core.o intel_soc_pmic_crc.o

intel-soc-pmic-$(CONFIG_INTEL_PMC_IPC)	+= intel_soc_pmic_bxtwc.o

obj-$(CONFIG_INTEL_SOC_PMIC)	+= intel-soc-pmic.o

drivers/pinctrl/qcom/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -150,7 +150,7 @@ config PINCTRL_QCOM_SSBI_PMIC 


config PINCTRL_WCD

	tristate "Qualcomm Technologies, Inc WCD pin controller driver"

	depends on WCD934X_CODEC

	depends on WCD9XXX_CODEC_CORE

	help

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

	  WCD gpio controller block.

drivers/soundwire/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ menuconfig SOUNDWIRE 


if SOUNDWIRE

config SOUNDWIRE_WCD_CTRL

	depends on WCD9335_CODEC || WCD934X_CODEC

	depends on WCD9XXX_CODEC_CORE

	tristate "QTI WCD CODEC Soundwire controller"

	default n

	help