Merge branch 'asoc-4.18' into asoc-4.19 for amd dep

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

diff --cc sound/soc/sh/rcar/ssi.c
Simple merge

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