Merge branch 'asoc-4.19' into asoc-4.20 for rcar dep

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

diff --cc sound/soc/sh/rcar/rsnd.h
Simple merge

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