Merge branch 'regmap-4.21' into regmap-5.0