Merge branch 'asoc-4.18' into asoc-4.19 wmadsp dep

diff --cc sound/soc/codecs/hdmi-codec.c
Simple merge

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

diff --cc sound/soc/qcom/qdsp6/q6afe-dai.c
Simple merge

diff --cc sound/soc/qcom/qdsp6/q6asm-dai.c
Simple merge

diff --cc sound/soc/qcom/qdsp6/q6routing.c
Simple merge

diff --cc sound/soc/soc-pcm.c
Simple merge

diff --cc sound/soc/soc-utils.c
Simple merge