Merge remote-tracking branches 'asoc/topic/mediatek', 'asoc/topic/mtk', 'asoc/topic...

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

diff --cc sound/soc/mediatek/mt8173-max98090.c
Simple merge

diff --cc sound/soc/mediatek/mt8173-rt5650-rt5676.c
Simple merge

diff --cc sound/soc/mediatek/mtk-afe-pcm.c
Simple merge

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