summaryrefslogtreecommitdiffstats
path: root/sound/soc/codecs/Kconfig
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2016-09-24 23:05:10 -0700
committerMark Brown <broonie@kernel.org>2016-09-24 23:05:10 -0700
commit782f07290c5781539cdf2bca68f0596903c83c87 (patch)
tree3e051d08597d404230b6c34000e56d2d4d60e557 /sound/soc/codecs/Kconfig
parent2b26dd4c1fc5f83bc088f4a053120ca03817045e (diff)
parentc5f1edd405eb874cc2c81e8d62c6b3a73c502529 (diff)
downloadlinux-782f07290c5781539cdf2bca68f0596903c83c87.tar.gz
linux-782f07290c5781539cdf2bca68f0596903c83c87.tar.bz2
linux-782f07290c5781539cdf2bca68f0596903c83c87.zip
Merge branch 'topic/rt5663' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-rt5660
Diffstat (limited to 'sound/soc/codecs/Kconfig')
-rw-r--r--sound/soc/codecs/Kconfig7
1 files changed, 7 insertions, 0 deletions
diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig
index 890affe5eb65..bbca3ca64098 100644
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -113,6 +113,7 @@ config SND_SOC_ALL_CODECS
select SND_SOC_RT5651 if I2C
select SND_SOC_RT5659 if I2C
select SND_SOC_RT5660 if I2C
+ select SND_SOC_RT5663 if I2C
select SND_SOC_RT5670 if I2C
select SND_SOC_RT5677 if I2C && SPI_MASTER
select SND_SOC_SGTL5000 if I2C
@@ -647,6 +648,7 @@ config SND_SOC_RL6231
default y if SND_SOC_RT5651=y
default y if SND_SOC_RT5659=y
default y if SND_SOC_RT5660=y
+ default y if SND_SOC_RT5663=y
default y if SND_SOC_RT5670=y
default y if SND_SOC_RT5677=y
default m if SND_SOC_RT5514=m
@@ -656,6 +658,7 @@ config SND_SOC_RL6231
default m if SND_SOC_RT5651=m
default m if SND_SOC_RT5659=m
default m if SND_SOC_RT5660=m
+ default m if SND_SOC_RT5663=m
default m if SND_SOC_RT5670=m
default m if SND_SOC_RT5677=m
@@ -668,6 +671,7 @@ config SND_SOC_RL6347A
config SND_SOC_RT286
tristate
+ select SND_SOC_RT5663
depends on I2C
config SND_SOC_RT298
@@ -703,6 +707,9 @@ config SND_SOC_RT5659
config SND_SOC_RT5660
tristate
+config SND_SOC_RT5663
+ tristate
+
config SND_SOC_RT5670
tristate