Merge branch 'asoc-5.4' into asoc-5.5

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

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

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

diff --cc sound/soc/sof/intel/bdw.c
Simple merge

diff --cc sound/soc/sof/intel/byt.c
Simple merge