Merge branch 'asoc-5.2' into asoc-5.3

diff --cc sound/soc/generic/simple-card.c
Simple merge

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

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

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

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

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