Merge remote-tracking branches 'regmap/topic/64bit' and 'regmap/topic/irq-type' into...

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

diff --cc drivers/base/regmap/regmap-irq.c
index 4d2cb21,8d16db5,dbe7a0d..9b0d202
--- 1/drivers/base/regmap/regmap-irq.c
--- 2/drivers/base/regmap/regmap-irq.c
--- 3/drivers/base/regmap/regmap-irq.c
+++ b/drivers/base/regmap/regmap-irq.c
@@@@ -420,11 -420,10 -484,15 +484,16 @@@@ int regmap_add_irq_chip(struct regmap *
        else
                d->irq_reg_stride = 1;
   
++      if (chip->type_reg_stride)
++              d->type_reg_stride = chip->type_reg_stride;
++      else
++              d->type_reg_stride = 1;
++ 
        if (!map->use_single_read && map->reg_stride == 1 &&
            d->irq_reg_stride == 1) {
 --             d->status_reg_buf = kmalloc(map->format.val_bytes *
 --                                         chip->num_regs, GFP_KERNEL);
 ++             d->status_reg_buf = kmalloc_array(chip->num_regs,
 ++                                               map->format.val_bytes,
 ++                                               GFP_KERNEL);
                if (!d->status_reg_buf)
                        goto err_alloc;
        }

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

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