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

diff --cc include/sound/soc-dapm.h
Simple merge

diff --cc include/sound/soc.h
Simple merge

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

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

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

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

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

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

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