Merge remote-tracking branch 'regmap/topic/mmio' into regmap-next

diff --combined drivers/base/regmap/regcache.c
index 5c5090b,cccceb5..4170b7d
--- 1/drivers/base/regmap/regcache.c
--- 2/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@@ -30,7 -30,7 +30,7 @@@ static int regcache_hw_init(struct regm
        int i, j;
        int ret;
        int count;
-       unsigned int val;
+       unsigned int reg, val;
        void *tmp_buf;
  
        if (!map->num_reg_defaults_raw)
@@@ -57,7 -57,7 +57,7 @@@
                bool cache_bypass = map->cache_bypass;
                dev_warn(map->dev, "No cache defaults, reading back from HW\n");
  
 -              /* Bypass the cache access till data read from HW*/
 +              /* Bypass the cache access till data read from HW */
                map->cache_bypass = true;
                tmp_buf = kmalloc(map->cache_size_raw, GFP_KERNEL);
                if (!tmp_buf) {
@@@ -65,29 -65,48 +65,48 @@@
                        goto err_free;
                }
                ret = regmap_raw_read(map, 0, tmp_buf,
 -                                    map->num_reg_defaults_raw);
 +                                    map->cache_size_raw);
                map->cache_bypass = cache_bypass;
-               if (ret < 0)
-                       goto err_cache_free;
- 
-               map->reg_defaults_raw = tmp_buf;
-               map->cache_free = 1;
+               if (ret == 0) {
+                       map->reg_defaults_raw = tmp_buf;
+                       map->cache_free = 1;
+               } else {
+                       kfree(tmp_buf);
+               }
        }
  
        /* fill the reg_defaults */
        for (i = 0, j = 0; i < map->num_reg_defaults_raw; i++) {
-               if (regmap_volatile(map, i * map->reg_stride))
+               reg = i * map->reg_stride;
+ 
+               if (!regmap_readable(map, reg))
+                       continue;
+ 
+               if (regmap_volatile(map, reg))
                        continue;
-               val = regcache_get_val(map, map->reg_defaults_raw, i);
-               map->reg_defaults[j].reg = i * map->reg_stride;
+ 
+               if (map->reg_defaults_raw) {
+                       val = regcache_get_val(map, map->reg_defaults_raw, i);
+               } else {
+                       bool cache_bypass = map->cache_bypass;
+ 
+                       map->cache_bypass = true;
+                       ret = regmap_read(map, reg, &val);
+                       map->cache_bypass = cache_bypass;
+                       if (ret != 0) {
+                               dev_err(map->dev, "Failed to read %d: %d\n",
+                                       reg, ret);
+                               goto err_free;
+                       }
+               }
+ 
+               map->reg_defaults[j].reg = reg;
                map->reg_defaults[j].def = val;
                j++;
        }
  
        return 0;
  
- err_cache_free:
-       kfree(tmp_buf);
  err_free:
        kfree(map->reg_defaults);