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

Commit 5d8cf768 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/topic/kconfig' into asoc-next

parents 631476d7 54aba08f

sound/soc/codecs/Kconfig

+4 −4
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_AK5386

	select SND_SOC_AK5386

	select SND_SOC_ALC5623 if I2C

	select SND_SOC_ALC5623 if I2C

	select SND_SOC_ALC5632 if I2C

	select SND_SOC_ALC5632 if I2C

	select SND_SOC_BT_SCO

	select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC

	select SND_SOC_CQ0093VC if MFD_DAVINCI_VOICECODEC

	select SND_SOC_CS35L32 if I2C

	select SND_SOC_CS35L32 if I2C

	select SND_SOC_CS42L51_I2C if I2C

	select SND_SOC_CS42L51_I2C if I2C
@@ -64,7 +65,6 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_DA732X if I2C

	select SND_SOC_DA732X if I2C

	select SND_SOC_DA9055 if I2C

	select SND_SOC_DA9055 if I2C

	select SND_SOC_DMIC

	select SND_SOC_DMIC

	select SND_SOC_BT_SCO

	select SND_SOC_ES8328_SPI if SPI_MASTER

	select SND_SOC_ES8328_SPI if SPI_MASTER

	select SND_SOC_ES8328_I2C if I2C

	select SND_SOC_ES8328_I2C if I2C

	select SND_SOC_GTM601

	select SND_SOC_GTM601
@@ -370,6 +370,9 @@ config SND_SOC_ALC5623 
config SND_SOC_ALC5632

config SND_SOC_ALC5632

	tristate

	tristate





config SND_SOC_BT_SCO

	tristate



config SND_SOC_CQ0093VC

config SND_SOC_CQ0093VC

	tristate

	tristate
@@ -476,9 +479,6 @@ config SND_SOC_DA732X 
config SND_SOC_DA9055

config SND_SOC_DA9055

	tristate

	tristate





config SND_SOC_BT_SCO

	tristate



config SND_SOC_DMIC

config SND_SOC_DMIC

	tristate

	tristate

sound/soc/codecs/Makefile

+2 −2
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ snd-soc-ak4642-objs := ak4642.o 
snd-soc-ak4671-objs := ak4671.o

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

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

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

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

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

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

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

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

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

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

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

snd-soc-cs42l51-objs := cs42l51.o
@@ -55,7 +56,6 @@ snd-soc-da7218-objs := da7218.o 
snd-soc-da7219-objs := da7219.o da7219-aad.o

snd-soc-da7219-objs := da7219.o da7219-aad.o

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

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

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

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

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

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

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

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

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

snd-soc-es8328-i2c-objs := es8328-i2c.o

snd-soc-es8328-i2c-objs := es8328-i2c.o
@@ -247,6 +247,7 @@ obj-$(CONFIG_SND_SOC_AK5386) += snd-soc-ak5386.o 
obj-$(CONFIG_SND_SOC_ALC5623)    += snd-soc-alc5623.o

obj-$(CONFIG_SND_SOC_ALC5623)    += snd-soc-alc5623.o

obj-$(CONFIG_SND_SOC_ALC5632)	+= snd-soc-alc5632.o

obj-$(CONFIG_SND_SOC_ALC5632)	+= snd-soc-alc5632.o

obj-$(CONFIG_SND_SOC_ARIZONA)	+= snd-soc-arizona.o

obj-$(CONFIG_SND_SOC_ARIZONA)	+= snd-soc-arizona.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_CQ0093VC) += snd-soc-cq93vc.o

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

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

obj-$(CONFIG_SND_SOC_CS42L51)	+= snd-soc-cs42l51.o

obj-$(CONFIG_SND_SOC_CS42L51)	+= snd-soc-cs42l51.o
@@ -270,7 +271,6 @@ obj-$(CONFIG_SND_SOC_DA7218) += snd-soc-da7218.o 
obj-$(CONFIG_SND_SOC_DA7219)	+= snd-soc-da7219.o

obj-$(CONFIG_SND_SOC_DA7219)	+= snd-soc-da7219.o

obj-$(CONFIG_SND_SOC_DA732X)	+= snd-soc-da732x.o

obj-$(CONFIG_SND_SOC_DA732X)	+= snd-soc-da732x.o

obj-$(CONFIG_SND_SOC_DA9055)	+= snd-soc-da9055.o

obj-$(CONFIG_SND_SOC_DA9055)	+= snd-soc-da9055.o

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

obj-$(CONFIG_SND_SOC_DMIC)	+= snd-soc-dmic.o

obj-$(CONFIG_SND_SOC_DMIC)	+= snd-soc-dmic.o

obj-$(CONFIG_SND_SOC_ES8328)	+= snd-soc-es8328.o

obj-$(CONFIG_SND_SOC_ES8328)	+= snd-soc-es8328.o

obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o

obj-$(CONFIG_SND_SOC_ES8328_I2C)+= snd-soc-es8328-i2c.o