Merge remote-tracking branches 'regmap/topic/cache', 'regmap/topic/irq', 'regmap...

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

diff --cc drivers/base/regmap/regmap.c
index 92d9b79,6a19515,6a19515,3507737,6a19515,43065ce,4b2ed0c,c69bbc0..d0a0724
--- 1/drivers/base/regmap/regmap.c
--- 2/drivers/base/regmap/regmap.c
--- 3/drivers/base/regmap/regmap.c
--- 4/drivers/base/regmap/regmap.c
--- 5/drivers/base/regmap/regmap.c
--- 6/drivers/base/regmap/regmap.c
--- 7/drivers/base/regmap/regmap.c
--- 8/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@@@@@@@@ -2188,34 -2185,34 -2185,34 -2189,34 -2185,34 -2200,34 -2185,34 -2390,28 +2412,28 @@@@@@@@@ int regmap_register_patch(struct regma
                    num_regs))
                        return 0;
        
--- ---         map->lock(map->lock_arg);
--- --- 
--- ---         bypass = map->cache_bypass;
--- --- 
--- ---         map->cache_bypass = true;
--- ---         map->async = true;
--- --- 
--- ---         /* Write out first; it's useful to apply even if we fail later. */
--- ---         for (i = 0; i < num_regs; i++) {
--- ---                 ret = _regmap_write(map, regs[i].reg, regs[i].def);
--- ---                 if (ret != 0) {
--- ---                         dev_err(map->dev, "Failed to write %x = %x: %d\n",
--- ---                                 regs[i].reg, regs[i].def, ret);
--- ---                         goto out;
--- ---                 }
--- ---         }
--- --- 
       +        p = krealloc(map->patch,
       +                     sizeof(struct reg_default) * (map->patch_regs + num_regs),
       +                     GFP_KERNEL);
       +        if (p) {
       +                memcpy(p + map->patch_regs, regs, num_regs * sizeof(*regs));
       +                map->patch = p;
       +                map->patch_regs += num_regs;
       +        } else {
--- ---                 ret = -ENOMEM;
+++ ++++                return -ENOMEM;
       +        }
       +
+++ +++         map->lock(map->lock_arg);
+++ +++ 
+++ +++         bypass = map->cache_bypass;
+++ +++ 
+++ +++         map->cache_bypass = true;
+++ +++         map->async = true;
+++ +++ 
   -            /* Write out first; it's useful to apply even if we fail later. */
   -            for (i = 0; i < num_regs; i++) {
   -                    ret = _regmap_write(map, regs[i].reg, regs[i].def);
   -                    if (ret != 0) {
   -                            dev_err(map->dev, "Failed to write %x = %x: %d\n",
   -                                    regs[i].reg, regs[i].def, ret);
   -                            goto out;
   -                    }
   -            }
+++++++         ret = _regmap_multi_reg_write(map, regs, num_regs);
+++++++         if (ret != 0)
+++++++                 goto out;
+++ +++ 
       -        p = krealloc(map->patch,
       -                     sizeof(struct reg_default) * (map->patch_regs + num_regs),
       -                     GFP_KERNEL);
       -        if (p) {
       -                memcpy(p + map->patch_regs, regs, num_regs * sizeof(*regs));
       -                map->patch = p;
       -                map->patch_regs += num_regs;
       -        } else {
       -                ret = -ENOMEM;
       -        }
       -
        out:
                map->async = false;
                map->cache_bypass = bypass;

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