Merge existing fixes from regmap/for-5.8