Merge branch 'asoc-5.6' into asoc-next

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

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

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

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

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

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

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

diff --cc sound/soc/codecs/madera.h
Simple merge

diff --cc sound/soc/soc-generic-dmaengine-pcm.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/hda.h
Simple merge