Merge remote-tracking branches 'asoc/topic/adsp', 'asoc/topic/ak4104', 'asoc/topic...

diff --cc sound/soc/codecs/Kconfig
Simple merge

diff --cc sound/soc/codecs/Makefile
Simple merge

diff --cc sound/soc/codecs/cs42l51.c
Simple merge

diff --cc sound/soc/codecs/wm5110.c
Simple merge

diff --cc sound/soc/codecs/wm_adsp.c
Simple merge