Merge "ASoC: regmap: soundwire: fix incorrect register writes" into msm-4.9