From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 25 Nov 2019 13:27:33 +0000 (+0100)
Subject: Merge tag 'asoc-v5.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=09578eacaaa44149738267083ccc050990409f86;p=linux.git

Merge tag 'asoc-v5.5-2' of https://git./linux/kernel/git/broonie/sound into for-linus

ASoC: More updates for v5.5

Some more development work for v5.5.  Highlights include:

 - More cleanups from Morimoto-san.
 - Trigger word detection for RT5677.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

09578eacaaa44149738267083ccc050990409f86
diff --cc sound/soc/codecs/Kconfig
index 925e5f852348a,ec01e4f12a780..4abf37b5083fb
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@@ -676,10 -676,11 +676,11 @@@ config SND_SOC_L
         tristate
  
  config SND_SOC_DA7210
 -        tristate
 +	tristate
  
  config SND_SOC_DA7213
- 	tristate
+ 	tristate "Dialog DA7213 CODEC"
+ 	depends on I2C
  
  config SND_SOC_DA7218
  	tristate