ASoC: Merge up fixes from Linus' tree

Gets us pine64plus back if nothing else.

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

diff --cc sound/soc/codecs/rt722-sdca-sdw.c
Simple merge

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

diff --cc sound/soc/fsl/fsl_spdif.c
Simple merge