Merge branches 'regmap-core', 'regmap-mmio' and 'regmap-naming' into regmap-next

diff --cc drivers/base/regmap/internal.h
Simple merge

diff --cc drivers/base/regmap/regmap.c
index 178989a8949eabb98f3610db4d27dad5007e73f6,ee4fea351220447a514b6b30731f44d7c5f94b5b,b1dad1f9c47df25ffc1e36e81ce0d313f6c22e8b..40f910162781cdcaf08aabd47310e819fbcc06c7
--- 1/drivers/base/regmap/regmap.c
--- 2/drivers/base/regmap/regmap.c
--- 3/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@@ -212,9 -221,9 -191,8 +242,10 @@@@ struct regmap *regmap_init(struct devic
        map->format.pad_bytes = config->pad_bits / 8;
        map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
        map->format.buf_size += map->format.pad_bytes;
 ++     map->reg_shift = config->pad_bits % 8;
        map->dev = dev;
        map->bus = bus;
+ +     map->bus_context = bus_context;
        map->max_register = config->max_register;
        map->writeable_reg = config->writeable_reg;
        map->readable_reg = config->readable_reg;

diff --cc include/linux/regmap.h
Simple merge