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

Unverified Commit 2236a28f authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/cpcap', 'asoc/topic/cq93vc' and... 

Merge remote-tracking branches 'asoc/topic/cpcap', 'asoc/topic/cq93vc' and 'asoc/topic/cs35l32' into asoc-next
parents 53ccd1aa b305d8c2 4f404f38 fa643703

sound/soc/codecs/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -429,6 +429,10 @@ config SND_SOC_BD28623 
config SND_SOC_BT_SCO

	tristate "Dummy BT SCO codec driver"



config SND_SOC_CPCAP

	tristate "Motorola CPCAP codec"

	depends on MFD_CPCAP



config SND_SOC_CQ0093VC

	tristate

sound/soc/codecs/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ snd-soc-ak5558-objs := ak5558.o 
snd-soc-arizona-objs := arizona.o

snd-soc-bd28623-objs := bd28623.o

snd-soc-bt-sco-objs := bt-sco.o

snd-soc-cpcap-objs := cpcap.o

snd-soc-cq93vc-objs := cq93vc.o

snd-soc-cs35l32-objs := cs35l32.o

snd-soc-cs35l33-objs := cs35l33.o
@@ -290,6 +291,7 @@ obj-$(CONFIG_SND_SOC_ARIZONA) += snd-soc-arizona.o 
obj-$(CONFIG_SND_SOC_BD28623)	+= snd-soc-bd28623.o

obj-$(CONFIG_SND_SOC_BT_SCO)	+= snd-soc-bt-sco.o

obj-$(CONFIG_SND_SOC_CQ0093VC) += snd-soc-cq93vc.o

obj-$(CONFIG_SND_SOC_CPCAP)	+= snd-soc-cpcap.o

obj-$(CONFIG_SND_SOC_CS35L32)	+= snd-soc-cs35l32.o

obj-$(CONFIG_SND_SOC_CS35L33)	+= snd-soc-cs35l33.o

obj-$(CONFIG_SND_SOC_CS35L34)	+= snd-soc-cs35l34.o