ASoC: Merge fixes

Needed for new development.

diff --cc drivers/base/regmap/regmap.c
Simple merge

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

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

diff --cc sound/soc/rockchip/rockchip_i2s.c
Simple merge

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

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

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

diff --cc sound/soc/sof/sof-priv.h
Simple merge