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

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

Merge "mfd: remove unused wcd9330 codec related files"

parents 8c63126b f6e545c4

drivers/mfd/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -1645,20 +1645,6 @@ config WCD9XXX_CODEC_UTIL 
	  functions. This driver also hides the underlying bus related

	  functionalities.



config WCD9330_CODEC

	tristate "WCD9330 Codec"

	select SLIMBUS

	select MFD_CORE

	select WCD9XXX_CODEC_UTIL

	select MSM_CDC_SUPPLY

	select REGMAP_ALLOW_WRITE_DEBUGFS

	help

	  Enables the WCD9xxx codec core driver. The core driver provides

	  read/write capability to registers which are part of the

	  WCD9330 core and gives the ability to use the WCD9330 codec.

	  The WCD9330 codec support either I2C/I2S or Slimbus for

	  control and data exchnage with master processor.



config WCD9335_CODEC

	tristate "WCD9335 Codec"

	select SLIMBUS

drivers/mfd/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ obj-$(CONFIG_MFD_SKY81452) += sky81452.o 
obj-$(CONFIG_MSM_CDC_PINCTRL)	+= msm-cdc-pinctrl.o

obj-$(CONFIG_MSM_CDC_SUPPLY) += msm-cdc-supply.o

obj-$(CONFIG_WCD9XXX_CODEC_UTIL) += wcd9xxx-utils.o

obj-$(CONFIG_WCD9330_CODEC)	+= wcd9xxx-core.o wcd9xxx-irq.o wcd9xxx-slimslave.o\

						wcd9330-regmap.o

obj-$(CONFIG_WCD9335_CODEC)	+= wcd9xxx-core.o wcd9xxx-irq.o wcd9xxx-slimslave.o\

					wcd9335-regmap.o wcd9335-tables.o

obj-$(CONFIG_WCD934X_CODEC)	+= wcd9xxx-core.o wcd9xxx-irq.o wcd9xxx-slimslave.o\

drivers/mfd/wcd9330-regmap.c

deleted100644 → 0
+0 −990

File deleted.

Preview size limit exceeded, changes collapsed.

include/linux/mfd/wcd9xxx/wcd9330_registers.h

deleted100644 → 0
+0 −1626

File deleted.

Preview size limit exceeded, changes collapsed.

sound/soc/codecs/Kconfig

+2 −13
Original line number Diff line number Diff line
@@ -878,13 +878,6 @@ config SND_SOC_UDA1380 
config SND_SOC_WCD934X_DSD

        tristate



config SND_SOC_WCD9320

        tristate



config SND_SOC_WCD9330

        tristate

	depends on WCD9330_CODEC



config SND_SOC_WCD9335

        tristate

	depends on WCD9335_CODEC
@@ -916,21 +909,17 @@ config SND_SOC_WSA881X_ANALOG 
        tristate

	select REGMAP_I2C



config SND_SOC_WCD9XXX

	tristate

	default y if SND_SOC_WCD9320=y || SND_SOC_WCD9330=y || SND_SOC_WCD9335=y



config SND_SOC_WCD9XXX_V2

	tristate

	default y if SND_SOC_WCD9335=y



config SND_SOC_WCD_CPE

	tristate

	default y if SND_SOC_WCD9330=y || SND_SOC_WCD9335=y

	default y if SND_SOC_WCD9335=y



config AUDIO_EXT_CLK

	tristate

	default y if SND_SOC_WCD9335=y || SND_SOC_WCD9330=y || SND_SOC_SDM660_CDC=y

	default y if SND_SOC_WCD9335=y || SND_SOC_SDM660_CDC=y



config SND_SOC_WCD_MBHC

	tristate