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

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

diff --cc drivers/base/regmap/regcache-rbtree.c
index 92b779ee002bba20b6af60953aa2132526380c4e,5157fa04c2f0e04e6120878a97764d4375d52769,cca46007d969baf21aff58921318fe1124f708fa,5157fa04c2f0e04e6120878a97764d4375d52769..e49e71fab184ba77e8c4360c4e2009cc546c8f1e
--- 1/drivers/base/regmap/regcache-rbtree.c
--- 2/drivers/base/regmap/regcache-rbtree.c
--- 3/drivers/base/regmap/regcache-rbtree.c
--- 4/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@@@@ -138,9 -138,8 -138,8 -138,8 +138,9 @@@@@ static int rbtree_show(struct seq_file 
        unsigned int base, top;
        int nodes = 0;
        int registers = 0;
 +++    int average;
    
-- -    mutex_lock(&map->lock);
++ +    map->lock(map);
    
        for (node = rb_first(&rbtree_ctx->root); node != NULL;
             node = rb_next(node)) {
@@@@@ -153,15 -152,10 -152,10 -152,10 +153,15 @@@@@
                registers += top - base + 1;
        }
    
 +++    if (nodes)
 +++            average = registers / nodes;
 +++    else
 +++            average = 0;
 +++
        seq_printf(s, "%d nodes, %d registers, average %d registers\n",
 ---               nodes, registers, registers / nodes);
 +++               nodes, registers, average);
    
-- -    mutex_unlock(&map->lock);
++ +    map->unlock(map);
    
        return 0;
    }

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

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

diff --cc drivers/base/regmap/regmap.c
index 7a3f535e481c69ac31254b84bc6111e0d9793814,178989a8949eabb98f3610db4d27dad5007e73f6,ee4fea351220447a514b6b30731f44d7c5f94b5b,b1dad1f9c47df25ffc1e36e81ce0d313f6c22e8b..40f910162781cdcaf08aabd47310e819fbcc06c7
--- 1/drivers/base/regmap/regmap.c
--- 2/drivers/base/regmap/regmap.c
--- 3/drivers/base/regmap/regmap.c
--- 4/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@@@ -191,8 -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