13 files changed, 530 insertions, 98 deletions

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index d141b80479b5..fcafc5b2e651 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -22,6 +22,7 @@ struct regcache_ops;
 struct regmap_format {
         size_t buf_size;
         size_t reg_bytes;
+        size_t pad_bytes;
         size_t val_bytes;
         void (*format_write)(struct regmap *map,
                              unsigned int reg, unsigned int val);
@@ -65,16 +66,16 @@ struct regmap {
         unsigned int num_reg_defaults_raw;
 
         /* if set, only the cache is modified not the HW */
-        unsigned int cache_only:1;
+        u32 cache_only;
         /* if set, only the HW is modified not the cache */
-        unsigned int cache_bypass:1;
+        u32 cache_bypass;
         /* if set, remember to free reg_defaults_raw */
-        unsigned int cache_free:1;
+        bool cache_free;
 
         struct reg_default *reg_defaults;
         const void *reg_defaults_raw;
         void *cache;
-        bool cache_dirty;
+        u32 cache_dirty;
 
         struct reg_default *patch;
         int patch_regs;
@@ -87,7 +88,7 @@ struct regcache_ops {
         int (*exit)(struct regmap *map);
         int (*read)(struct regmap *map, unsigned int reg, unsigned int *value);
         int (*write)(struct regmap *map, unsigned int reg, unsigned int value);
-        int (*sync)(struct regmap *map);
+        int (*sync)(struct regmap *map, unsigned int min, unsigned int max);
 };
 
 bool regmap_writeable(struct regmap *map, unsigned int reg);
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index b7d16143edeb..8d0061569326 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -331,7 +331,8 @@ out:
         return ret;
 }
 
-static int regcache_lzo_sync(struct regmap *map)
+static int regcache_lzo_sync(struct regmap *map, unsigned int min,
+                             unsigned int max)
 {
         struct regcache_lzo_ctx **lzo_blocks;
         unsigned int val;
@@ -339,10 +340,21 @@ static int regcache_lzo_sync(struct regmap *map)
         int ret;
 
         lzo_blocks = map->cache;
-        for_each_set_bit(i, lzo_blocks[0]->sync_bmp, lzo_blocks[0]->sync_bmp_nbits) {
+        i = min;
+        for_each_set_bit_cont(i, lzo_blocks[0]->sync_bmp,
+                              lzo_blocks[0]->sync_bmp_nbits) {
+                if (i > max)
+                        continue;
+
                 ret = regcache_read(map, i, &val);
                 if (ret)
                         return ret;
+
+                /* Is this the hardware default?  If so skip. */
+                ret = regcache_lookup_reg(map, i);
+                if (ret > 0 && val == map->reg_defaults[ret].def)
+                        continue;
+
                 map->cache_bypass = 1;
                 ret = _regmap_write(map, i, val);
                 map->cache_bypass = 0;
diff --git a/drivers/base/regmap/regcache-rbtree.c b/drivers/base/regmap/regcache-rbtree.c
index 32620c4f1683..8d51916a283d 100644
--- a/drivers/base/regmap/regcache-rbtree.c
+++ b/drivers/base/regmap/regcache-rbtree.c
@@ -357,7 +357,8 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg,
         return 0;
 }
 
-static int regcache_rbtree_sync(struct regmap *map)
+static int regcache_rbtree_sync(struct regmap *map, unsigned int min,
+                                unsigned int max)
 {
         struct regcache_rbtree_ctx *rbtree_ctx;
         struct rb_node *node;
@@ -365,19 +366,37 @@ static int regcache_rbtree_sync(struct regmap *map)
         unsigned int regtmp;
         unsigned int val;
         int ret;
-        int i;
+        int i, base, end;
 
         rbtree_ctx = map->cache;
         for (node = rb_first(&rbtree_ctx->root); node; node = rb_next(node)) {
                 rbnode = rb_entry(node, struct regcache_rbtree_node, node);
-                for (i = 0; i < rbnode->blklen; i++) {
+
+                if (rbnode->base_reg < min)
+                        continue;
+                if (rbnode->base_reg > max)
+                        break;
+                if (rbnode->base_reg + rbnode->blklen < min)
+                        continue;
+
+                if (min > rbnode->base_reg)
+                        base = min - rbnode->base_reg;
+                else
+                        base = 0;
+
+                if (max < rbnode->base_reg + rbnode->blklen)
+                        end = rbnode->base_reg + rbnode->blklen - max;
+                else
+                        end = rbnode->blklen;
+
+                for (i = base; i < end; i++) {
                         regtmp = rbnode->base_reg + i;
                         val = regcache_rbtree_get_register(rbnode, i,
                                                            map->cache_word_size);
 
                         /* Is this the hardware default?  If so skip. */
                         ret = regcache_lookup_reg(map, i);
-                        if (ret > 0 && val == map->reg_defaults[ret].def)
+                        if (ret >= 0 && val == map->reg_defaults[ret].def)
                                 continue;
 
                         map->cache_bypass = 1;
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 5cd2a37e7688..938cb1d2ea26 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -35,12 +35,17 @@ static int regcache_hw_init(struct regmap *map)
                 return -EINVAL;
 
         if (!map->reg_defaults_raw) {
+                u32 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*/
+                map->cache_bypass = 1;
                 tmp_buf = kmalloc(map->cache_size_raw, GFP_KERNEL);
                 if (!tmp_buf)
                         return -EINVAL;
                 ret = regmap_bulk_read(map, 0, tmp_buf,
                                        map->num_reg_defaults_raw);
+                map->cache_bypass = cache_bypass;
                 if (ret < 0) {
                         kfree(tmp_buf);
                         return ret;
@@ -211,7 +216,6 @@ int regcache_read(struct regmap *map,
 
         return -EINVAL;
 }
-EXPORT_SYMBOL_GPL(regcache_read);
 
 /**
  * regcache_write: Set the value of a given register in the cache.
@@ -238,7 +242,6 @@ int regcache_write(struct regmap *map,
 
         return 0;
 }
-EXPORT_SYMBOL_GPL(regcache_write);
 
 /**
  * regcache_sync: Sync the register cache with the hardware.
@@ -254,12 +257,11 @@ EXPORT_SYMBOL_GPL(regcache_write);
 int regcache_sync(struct regmap *map)
 {
         int ret = 0;
-        unsigned int val;
         unsigned int i;
         const char *name;
         unsigned int bypass;
 
-        BUG_ON(!map->cache_ops);
+        BUG_ON(!map->cache_ops || !map->cache_ops->sync);
 
         mutex_lock(&map->lock);
         /* Remember the initial bypass state */
@@ -269,7 +271,11 @@ int regcache_sync(struct regmap *map)
         name = map->cache_ops->name;
         trace_regcache_sync(map->dev, name, "start");
 
+        if (!map->cache_dirty)
+                goto out;
+
         /* Apply any patch first */
+        map->cache_bypass = 1;
         for (i = 0; i < map->patch_regs; i++) {
                 ret = _regmap_write(map, map->patch[i].reg, map->patch[i].def);
                 if (ret != 0) {
@@ -278,27 +284,13 @@ int regcache_sync(struct regmap *map)
                         goto out;
                 }
         }
+        map->cache_bypass = 0;
 
-        if (!map->cache_dirty)
-                goto out;
-        if (map->cache_ops->sync) {
-                ret = map->cache_ops->sync(map);
-        } else {
-                for (i = 0; i < map->num_reg_defaults; i++) {
-                        ret = regcache_read(map, i, &val);
-                        if (ret < 0)
-                                goto out;
-                        map->cache_bypass = 1;
-                        ret = _regmap_write(map, i, val);
-                        map->cache_bypass = 0;
-                        if (ret < 0)
-                                goto out;
-                        dev_dbg(map->dev, "Synced register %#x, value %#x\n",
-                                map->reg_defaults[i].reg,
-                                map->reg_defaults[i].def);
-                }
+        ret = map->cache_ops->sync(map, 0, map->max_register);
+
+        if (ret == 0)
+                map->cache_dirty = false;
 
-        }
 out:
         trace_regcache_sync(map->dev, name, "stop");
         /* Restore the bypass state */
@@ -310,6 +302,51 @@ out:
 EXPORT_SYMBOL_GPL(regcache_sync);
 
 /**
+ * regcache_sync_region: Sync part  of the register cache with the hardware.
+ *
+ * @map: map to sync.
+ * @min: first register to sync
+ * @max: last register to sync
+ *
+ * Write all non-default register values in the specified region to
+ * the hardware.
+ *
+ * Return a negative value on failure, 0 on success.
+ */
+int regcache_sync_region(struct regmap *map, unsigned int min,
+                         unsigned int max)
+{
+        int ret = 0;
+        const char *name;
+        unsigned int bypass;
+
+        BUG_ON(!map->cache_ops || !map->cache_ops->sync);
+
+        mutex_lock(&map->lock);
+
+        /* Remember the initial bypass state */
+        bypass = map->cache_bypass;
+
+        name = map->cache_ops->name;
+        dev_dbg(map->dev, "Syncing %s cache from %d-%d\n", name, min, max);
+
+        trace_regcache_sync(map->dev, name, "start region");
+
+        if (!map->cache_dirty)
+                goto out;
+
+        ret = map->cache_ops->sync(map, min, max);
+
+out:
+        trace_regcache_sync(map->dev, name, "stop region");
+        /* Restore the bypass state */
+        map->cache_bypass = bypass;
+        mutex_unlock(&map->lock);
+
+        return ret;
+}
+
+/**
  * regcache_cache_only: Put a register map into cache only mode
  *
  * @map: map to configure
@@ -326,6 +363,7 @@ void regcache_cache_only(struct regmap *map, bool enable)
         mutex_lock(&map->lock);
         WARN_ON(map->cache_bypass && enable);
         map->cache_only = enable;
+        trace_regmap_cache_only(map->dev, enable);
         mutex_unlock(&map->lock);
 }
 EXPORT_SYMBOL_GPL(regcache_cache_only);
@@ -363,6 +401,7 @@ void regcache_cache_bypass(struct regmap *map, bool enable)
         mutex_lock(&map->lock);
         WARN_ON(map->cache_only && enable);
         map->cache_bypass = enable;
+        trace_regmap_cache_bypass(map->dev, enable);
         mutex_unlock(&map->lock);
 }
 EXPORT_SYMBOL_GPL(regcache_cache_bypass);
@@ -385,10 +424,16 @@ bool regcache_set_val(void *base, unsigned int idx,
                 cache[idx] = val;
                 break;
         }
+        case 4: {
+                u32 *cache = base;
+                if (cache[idx] == val)
+                        return true;
+                cache[idx] = val;
+                break;
+        }
         default:
                 BUG();
         }
-        /* unreachable */
         return false;
 }
 
@@ -407,6 +452,10 @@ unsigned int regcache_get_val(const void *base, unsigned int idx,
                 const u16 *cache = base;
                 return cache[idx];
         }
+        case 4: {
+                const u32 *cache = base;
+                return cache[idx];
+        }
         default:
                 BUG();
         }
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index 6f397476e27c..372f81a21201 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <linux/mutex.h>
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
@@ -33,6 +32,35 @@ static int regmap_open_file(struct inode *inode, struct file *file)
         return 0;
 }
 
+static ssize_t regmap_name_read_file(struct file *file,
+                                     char __user *user_buf, size_t count,
+                                     loff_t *ppos)
+{
+        struct regmap *map = file->private_data;
+        int ret;
+        char *buf;
+
+        buf = kmalloc(PAGE_SIZE, GFP_KERNEL);
+        if (!buf)
+                return -ENOMEM;
+
+        ret = snprintf(buf, PAGE_SIZE, "%s\n", map->dev->driver->name);
+        if (ret < 0) {
+                kfree(buf);
+                return ret;
+        }
+
+        ret = simple_read_from_buffer(user_buf, count, ppos, buf, ret);
+        kfree(buf);
+        return ret;
+}
+
+static const struct file_operations regmap_name_fops = {
+        .open = regmap_open_file,
+        .read = regmap_name_read_file,
+        .llseek = default_llseek,
+};
+
 static ssize_t regmap_map_read_file(struct file *file, char __user *user_buf,
                                     size_t count, loff_t *ppos)
 {
@@ -103,9 +131,51 @@ out:
         return ret;
 }
 
+#undef REGMAP_ALLOW_WRITE_DEBUGFS
+#ifdef REGMAP_ALLOW_WRITE_DEBUGFS
+/*
+ * This can be dangerous especially when we have clients such as
+ * PMICs, therefore don't provide any real compile time configuration option
+ * for this feature, people who want to use this will need to modify
+ * the source code directly.
+ */
+static ssize_t regmap_map_write_file(struct file *file,
+                                     const char __user *user_buf,
+                                     size_t count, loff_t *ppos)
+{
+        char buf[32];
+        size_t buf_size;
+        char *start = buf;
+        unsigned long reg, value;
+        struct regmap *map = file->private_data;
+
+        buf_size = min(count, (sizeof(buf)-1));
+        if (copy_from_user(buf, user_buf, buf_size))
+                return -EFAULT;
+        buf[buf_size] = 0;
+
+        while (*start == ' ')
+                start++;
+        reg = simple_strtoul(start, &start, 16);
+        while (*start == ' ')
+                start++;
+        if (strict_strtoul(start, 16, &value))
+                return -EINVAL;
+
+        /* Userspace has been fiddling around behind the kernel's back */
+        add_taint(TAINT_USER);
+
+        regmap_write(map, reg, value);
+        return buf_size;
+}
+#else
+#define regmap_map_write_file NULL
+#endif
+
 static const struct file_operations regmap_map_fops = {
         .open = regmap_open_file,
         .read = regmap_map_read_file,
+        .write = regmap_map_write_file,
         .llseek = default_llseek,
 };
 
@@ -186,12 +256,24 @@ void regmap_debugfs_init(struct regmap *map)
                 return;
         }
 
+        debugfs_create_file("name", 0400, map->debugfs,
+                            map, &regmap_name_fops);
+
         if (map->max_register) {
                 debugfs_create_file("registers", 0400, map->debugfs,
                                     map, &regmap_map_fops);
                 debugfs_create_file("access", 0400, map->debugfs,
                                     map, &regmap_access_fops);
         }
+
+        if (map->cache_type) {
+                debugfs_create_bool("cache_only", 0400, map->debugfs,
+                                    &map->cache_only);
+                debugfs_create_bool("cache_dirty", 0400, map->debugfs,
+                                    &map->cache_dirty);
+                debugfs_create_bool("cache_bypass", 0400, map->debugfs,
+                                    &map->cache_bypass);
+        }
 }
 
 void regmap_debugfs_exit(struct regmap *map)
diff --git a/drivers/base/regmap/regmap-i2c.c b/drivers/base/regmap/regmap-i2c.c
index 38621ec87c05..9a3a8c564389 100644
--- a/drivers/base/regmap/regmap-i2c.c
+++ b/drivers/base/regmap/regmap-i2c.c
@@ -111,4 +111,21 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c,
 }
 EXPORT_SYMBOL_GPL(regmap_init_i2c);
 
+/**
+ * devm_regmap_init_i2c(): Initialise managed register map
+ *
+ * @i2c: Device that will be interacted with
+ * @config: Configuration for register map
+ *
+ * The return value will be an ERR_PTR() on error or a valid pointer
+ * to a struct regmap.  The regmap will be automatically freed by the
+ * device management code.
+ */
+struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c,
+                                    const struct regmap_config *config)
+{
+        return devm_regmap_init(&i2c->dev, &regmap_i2c, config);
+}
+EXPORT_SYMBOL_GPL(devm_regmap_init_i2c);
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/base/regmap/regmap-spi.c b/drivers/base/regmap/regmap-spi.c
index 2560658de344..7c0c35a39c33 100644
--- a/drivers/base/regmap/regmap-spi.c
+++ b/drivers/base/regmap/regmap-spi.c
@@ -70,4 +70,21 @@ struct regmap *regmap_init_spi(struct spi_device *spi,
 }
 EXPORT_SYMBOL_GPL(regmap_init_spi);
 
+/**
+ * devm_regmap_init_spi(): Initialise register map
+ *
+ * @spi: Device that will be interacted with
+ * @config: Configuration for register map
+ *
+ * The return value will be an ERR_PTR() on error or a valid pointer
+ * to a struct regmap.  The map will be automatically freed by the
+ * device management code.
+ */
+struct regmap *devm_regmap_init_spi(struct spi_device *spi,
+                                    const struct regmap_config *config)
+{
+        return devm_regmap_init(&spi->dev, &regmap_spi, config);
+}
+EXPORT_SYMBOL_GPL(devm_regmap_init_spi);
+
 MODULE_LICENSE("GPL");
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 7ac234f0b1c5..7a3f535e481c 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -10,8 +10,9 @@
  * published by the Free Software Foundation.
  */
 
+#include <linux/device.h>
 #include <linux/slab.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/mutex.h>
 #include <linux/err.h>
 
@@ -36,6 +37,9 @@ bool regmap_readable(struct regmap *map, unsigned int reg)
         if (map->max_register && reg > map->max_register)
                 return false;
 
+        if (map->format.format_write)
+                return false;
+
         if (map->readable_reg)
                 return map->readable_reg(map->dev, reg);
 
@@ -44,7 +48,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg)
 
 bool regmap_volatile(struct regmap *map, unsigned int reg)
 {
-        if (map->max_register && reg > map->max_register)
+        if (!regmap_readable(map, reg))
                 return false;
 
         if (map->volatile_reg)
@@ -55,7 +59,7 @@ bool regmap_volatile(struct regmap *map, unsigned int reg)
 
 bool regmap_precious(struct regmap *map, unsigned int reg)
 {
-        if (map->max_register && reg > map->max_register)
+        if (!regmap_readable(map, reg))
                 return false;
 
         if (map->precious_reg)
@@ -76,6 +80,14 @@ static bool regmap_volatile_range(struct regmap *map, unsigned int reg,
         return true;
 }
 
+static void regmap_format_2_6_write(struct regmap *map,
+                                     unsigned int reg, unsigned int val)
+{
+        u8 *out = map->work_buf;
+
+        *out = (reg << 6) | val;
+}
+
 static void regmap_format_4_12_write(struct regmap *map,
                                      unsigned int reg, unsigned int val)
 {
@@ -114,6 +126,13 @@ static void regmap_format_16(void *buf, unsigned int val)
         b[0] = cpu_to_be16(val);
 }
 
+static void regmap_format_32(void *buf, unsigned int val)
+{
+        __be32 *b = buf;
+
+        b[0] = cpu_to_be32(val);
+}
+
 static unsigned int regmap_parse_8(void *buf)
 {
         u8 *b = buf;
@@ -130,6 +149,15 @@ static unsigned int regmap_parse_16(void *buf)
         return b[0];
 }
 
+static unsigned int regmap_parse_32(void *buf)
+{
+        __be32 *b = buf;
+
+        b[0] = be32_to_cpu(b[0]);
+
+        return b[0];
+}
+
 /**
  * regmap_init(): Initialise register map
  *
@@ -159,8 +187,10 @@ struct regmap *regmap_init(struct device *dev,
 
         mutex_init(&map->lock);
         map->format.buf_size = (config->reg_bits + config->val_bits) / 8;
-        map->format.reg_bytes = config->reg_bits / 8;
-        map->format.val_bytes = config->val_bits / 8;
+        map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
+        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->dev = dev;
         map->bus = bus;
         map->max_register = config->max_register;
@@ -178,6 +208,16 @@ struct regmap *regmap_init(struct device *dev,
         }
 
         switch (config->reg_bits) {
+        case 2:
+                switch (config->val_bits) {
+                case 6:
+                        map->format.format_write = regmap_format_2_6_write;
+                        break;
+                default:
+                        goto err_map;
+                }
+                break;
+
         case 4:
                 switch (config->val_bits) {
                 case 12:
@@ -216,6 +256,10 @@ struct regmap *regmap_init(struct device *dev,
                 map->format.format_reg = regmap_format_16;
                 break;
 
+        case 32:
+                map->format.format_reg = regmap_format_32;
+                break;
+
         default:
                 goto err_map;
         }
@@ -229,13 +273,17 @@ struct regmap *regmap_init(struct device *dev,
                 map->format.format_val = regmap_format_16;
                 map->format.parse_val = regmap_parse_16;
                 break;
+        case 32:
+                map->format.format_val = regmap_format_32;
+                map->format.parse_val = regmap_parse_32;
+                break;
         }
 
         if (!map->format.format_write &&
             !(map->format.format_reg && map->format.format_val))
                 goto err_map;
 
-        map->work_buf = kmalloc(map->format.buf_size, GFP_KERNEL);
+        map->work_buf = kzalloc(map->format.buf_size, GFP_KERNEL);
         if (map->work_buf == NULL) {
                 ret = -ENOMEM;
                 goto err_map;
@@ -258,6 +306,45 @@ err:
 }
 EXPORT_SYMBOL_GPL(regmap_init);
 
+static void devm_regmap_release(struct device *dev, void *res)
+{
+        regmap_exit(*(struct regmap **)res);
+}
+
+/**
+ * devm_regmap_init(): Initialise managed register map
+ *
+ * @dev: Device that will be interacted with
+ * @bus: Bus-specific callbacks to use with device
+ * @config: Configuration for register map
+ *
+ * The return value will be an ERR_PTR() on error or a valid pointer
+ * to a struct regmap.  This function should generally not be called
+ * directly, it should be called by bus-specific init functions.  The
+ * map will be automatically freed by the device management code.
+ */
+struct regmap *devm_regmap_init(struct device *dev,
+                                const struct regmap_bus *bus,
+                                const struct regmap_config *config)
+{
+        struct regmap **ptr, *regmap;
+
+        ptr = devres_alloc(devm_regmap_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+
+        regmap = regmap_init(dev, bus, config);
+        if (!IS_ERR(regmap)) {
+                *ptr = regmap;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return regmap;
+}
+EXPORT_SYMBOL_GPL(devm_regmap_init);
+
 /**
  * regmap_reinit_cache(): Reinitialise the current register cache
  *
@@ -276,6 +363,7 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
         mutex_lock(&map->lock);
 
         regcache_exit(map);
+        regmap_debugfs_exit(map);
 
         map->max_register = config->max_register;
         map->writeable_reg = config->writeable_reg;
@@ -284,6 +372,8 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
         map->precious_reg = config->precious_reg;
         map->cache_type = config->cache_type;
 
+        regmap_debugfs_init(map);
+
         map->cache_bypass = false;
         map->cache_only = false;
 
@@ -321,6 +411,26 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg,
                         if (!map->writeable_reg(map->dev, reg + i))
                                 return -EINVAL;
 
+        if (!map->cache_bypass && map->format.parse_val) {
+                unsigned int ival;
+                int val_bytes = map->format.val_bytes;
+                for (i = 0; i < val_len / val_bytes; i++) {
+                        memcpy(map->work_buf, val + (i * val_bytes), val_bytes);
+                        ival = map->format.parse_val(map->work_buf);
+                        ret = regcache_write(map, reg + i, ival);
+                        if (ret) {
+                                dev_err(map->dev,
+                                   "Error in caching of register: %u ret: %d\n",
+                                        reg + i, ret);
+                                return ret;
+                        }
+                }
+                if (map->cache_only) {
+                        map->cache_dirty = true;
+                        return 0;
+                }
+        }
+
         map->format.format_reg(map->work_buf, reg);
 
         u8[0] |= map->write_flag_mask;
@@ -332,23 +442,28 @@ static int _regmap_raw_write(struct regmap *map, unsigned int reg,
          * send the work_buf directly, otherwise try to do a gather
          * write.
          */
-        if (val == map->work_buf + map->format.reg_bytes)
+        if (val == (map->work_buf + map->format.pad_bytes +
+                    map->format.reg_bytes))
                 ret = map->bus->write(map->dev, map->work_buf,
-                                      map->format.reg_bytes + val_len);
+                                      map->format.reg_bytes +
+                                      map->format.pad_bytes +
+                                      val_len);
         else if (map->bus->gather_write)
                 ret = map->bus->gather_write(map->dev, map->work_buf,
-                                             map->format.reg_bytes,
+                                             map->format.reg_bytes +
+                                             map->format.pad_bytes,
                                              val, val_len);
 
         /* If that didn't work fall back on linearising by hand. */
         if (ret == -ENOTSUPP) {
-                len = map->format.reg_bytes + val_len;
-                buf = kmalloc(len, GFP_KERNEL);
+                len = map->format.reg_bytes + map->format.pad_bytes + val_len;
+                buf = kzalloc(len, GFP_KERNEL);
                 if (!buf)
                         return -ENOMEM;
 
                 memcpy(buf, map->work_buf, map->format.reg_bytes);
-                memcpy(buf + map->format.reg_bytes, val, val_len);
+                memcpy(buf + map->format.reg_bytes + map->format.pad_bytes,
+                       val, val_len);
                 ret = map->bus->write(map->dev, buf, len);
 
                 kfree(buf);
@@ -366,7 +481,7 @@ int _regmap_write(struct regmap *map, unsigned int reg,
         int ret;
         BUG_ON(!map->format.format_write && !map->format.format_val);
 
-        if (!map->cache_bypass) {
+        if (!map->cache_bypass && map->format.format_write) {
                 ret = regcache_write(map, reg, val);
                 if (ret != 0)
                         return ret;
@@ -390,10 +505,12 @@ int _regmap_write(struct regmap *map, unsigned int reg,
 
                 return ret;
         } else {
-                map->format.format_val(map->work_buf + map->format.reg_bytes,
-                                       val);
+                map->format.format_val(map->work_buf + map->format.reg_bytes
+                                       + map->format.pad_bytes, val);
                 return _regmap_raw_write(map, reg,
-                                         map->work_buf + map->format.reg_bytes,
+                                         map->work_buf +
+                                         map->format.reg_bytes +
+                                         map->format.pad_bytes,
                                          map->format.val_bytes);
         }
 }
@@ -441,12 +558,8 @@ EXPORT_SYMBOL_GPL(regmap_write);
 int regmap_raw_write(struct regmap *map, unsigned int reg,
                      const void *val, size_t val_len)
 {
-        size_t val_count = val_len / map->format.val_bytes;
         int ret;
 
-        WARN_ON(!regmap_volatile_range(map, reg, val_count) &&
-                map->cache_type != REGCACHE_NONE);
-
         mutex_lock(&map->lock);
 
         ret = _regmap_raw_write(map, reg, val, val_len);
@@ -457,6 +570,56 @@ int regmap_raw_write(struct regmap *map, unsigned int reg,
 }
 EXPORT_SYMBOL_GPL(regmap_raw_write);
 
+/*
+ * regmap_bulk_write(): Write multiple registers to the device
+ *
+ * @map: Register map to write to
+ * @reg: First register to be write from
+ * @val: Block of data to be written, in native register size for device
+ * @val_count: Number of registers to write
+ *
+ * This function is intended to be used for writing a large block of
+ * data to be device either in single transfer or multiple transfer.
+ *
+ * A value of zero will be returned on success, a negative errno will
+ * be returned in error cases.
+ */
+int regmap_bulk_write(struct regmap *map, unsigned int reg, const void *val,
+                     size_t val_count)
+{
+        int ret = 0, i;
+        size_t val_bytes = map->format.val_bytes;
+        void *wval;
+
+        if (!map->format.parse_val)
+                return -EINVAL;
+
+        mutex_lock(&map->lock);
+
+        /* No formatting is require if val_byte is 1 */
+        if (val_bytes == 1) {
+                wval = (void *)val;
+        } else {
+                wval = kmemdup(val, val_count * val_bytes, GFP_KERNEL);
+                if (!wval) {
+                        ret = -ENOMEM;
+                        dev_err(map->dev, "Error in memory allocation\n");
+                        goto out;
+                }
+                for (i = 0; i < val_count * val_bytes; i += val_bytes)
+                        map->format.parse_val(wval + i);
+        }
+        ret = _regmap_raw_write(map, reg, wval, val_bytes * val_count);
+
+        if (val_bytes != 1)
+                kfree(wval);
+
+out:
+        mutex_unlock(&map->lock);
+        return ret;
+}
+EXPORT_SYMBOL_GPL(regmap_bulk_write);
+
 static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
                             unsigned int val_len)
 {
@@ -476,7 +639,8 @@ static int _regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
         trace_regmap_hw_read_start(map->dev, reg,
                                    val_len / map->format.val_bytes);
 
-        ret = map->bus->read(map->dev, map->work_buf, map->format.reg_bytes,
+        ret = map->bus->read(map->dev, map->work_buf,
+                             map->format.reg_bytes + map->format.pad_bytes,
                              val, val_len);
 
         trace_regmap_hw_read_done(map->dev, reg,
@@ -549,16 +713,32 @@ EXPORT_SYMBOL_GPL(regmap_read);
 int regmap_raw_read(struct regmap *map, unsigned int reg, void *val,
                     size_t val_len)
 {
-        size_t val_count = val_len / map->format.val_bytes;
-        int ret;
-
-        WARN_ON(!regmap_volatile_range(map, reg, val_count) &&
-                map->cache_type != REGCACHE_NONE);
+        size_t val_bytes = map->format.val_bytes;
+        size_t val_count = val_len / val_bytes;
+        unsigned int v;
+        int ret, i;
 
         mutex_lock(&map->lock);
 
-        ret = _regmap_raw_read(map, reg, val, val_len);
+        if (regmap_volatile_range(map, reg, val_count) || map->cache_bypass ||
+            map->cache_type == REGCACHE_NONE) {
+                /* Physical block read if there's no cache involved */
+                ret = _regmap_raw_read(map, reg, val, val_len);
+
+        } else {
+                /* Otherwise go word by word for the cache; should be low
+                 * cost as we expect to hit the cache.
+                 */
+                for (i = 0; i < val_count; i++) {
+                        ret = _regmap_read(map, reg + i, &v);
+                        if (ret != 0)
+                                goto out;
+
+                        map->format.format_val(val + (i * val_bytes), v);
+                }
+        }
 
+ out:
         mutex_unlock(&map->lock);
 
         return ret;
@@ -712,7 +892,7 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
                 }
         }
 
-        map->patch = kcalloc(sizeof(struct reg_default), num_regs, GFP_KERNEL);
+        map->patch = kcalloc(num_regs, sizeof(struct reg_default), GFP_KERNEL);
         if (map->patch != NULL) {
                 memcpy(map->patch, regs,
                        num_regs * sizeof(struct reg_default));
diff --git a/drivers/mfd/wm831x-core.c b/drivers/mfd/wm831x-core.c
index f5e54fae8ada..838056c3493a 100644
--- a/drivers/mfd/wm831x-core.c
+++ b/drivers/mfd/wm831x-core.c
@@ -1631,7 +1631,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         ret = wm831x_reg_read(wm831x, WM831X_PARENT_ID);
         if (ret < 0) {
                 dev_err(wm831x->dev, "Failed to read parent ID: %d\n", ret);
-                goto err_regmap;
+                goto err;
         }
         switch (ret) {
         case 0x6204:
@@ -1640,20 +1640,20 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         default:
                 dev_err(wm831x->dev, "Device is not a WM831x: ID %x\n", ret);
                 ret = -EINVAL;
-                goto err_regmap;
+                goto err;
         }
 
         ret = wm831x_reg_read(wm831x, WM831X_REVISION);
         if (ret < 0) {
                 dev_err(wm831x->dev, "Failed to read revision: %d\n", ret);
-                goto err_regmap;
+                goto err;
         }
         rev = (ret & WM831X_PARENT_REV_MASK) >> WM831X_PARENT_REV_SHIFT;
 
         ret = wm831x_reg_read(wm831x, WM831X_RESET_ID);
         if (ret < 0) {
                 dev_err(wm831x->dev, "Failed to read device ID: %d\n", ret);
-                goto err_regmap;
+                goto err;
         }
 
         /* Some engineering samples do not have the ID set, rely on
@@ -1728,7 +1728,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         default:
                 dev_err(wm831x->dev, "Unknown WM831x device %04x\n", ret);
                 ret = -EINVAL;
-                goto err_regmap;
+                goto err;
         }
 
         /* This will need revisiting in future but is OK for all
@@ -1742,7 +1742,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
         ret = wm831x_reg_read(wm831x, WM831X_SECURITY_KEY);
         if (ret < 0) {
                 dev_err(wm831x->dev, "Failed to read security key: %d\n", ret);
-                goto err_regmap;
+                goto err;
         }
         if (ret != 0) {
                 dev_warn(wm831x->dev, "Security key had non-zero value %x\n",
@@ -1755,7 +1755,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
                 ret = pdata->pre_init(wm831x);
                 if (ret != 0) {
                         dev_err(wm831x->dev, "pre_init() failed: %d\n", ret);
-                        goto err_regmap;
+                        goto err;
                 }
         }
 
@@ -1778,7 +1778,7 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
 
         ret = wm831x_irq_init(wm831x, irq);
         if (ret != 0)
-                goto err_regmap;
+                goto err;
 
         wm831x_auxadc_init(wm831x);
 
@@ -1874,9 +1874,8 @@ int wm831x_device_init(struct wm831x *wm831x, unsigned long id, int irq)
 
 err_irq:
         wm831x_irq_exit(wm831x);
-err_regmap:
+err:
         mfd_remove_devices(wm831x->dev);
-        regmap_exit(wm831x->regmap);
         return ret;
 }
 
@@ -1887,7 +1886,6 @@ void wm831x_device_exit(struct wm831x *wm831x)
         if (wm831x->irq_base)
                 free_irq(wm831x->irq_base + WM831X_IRQ_AUXADC_DATA, wm831x);
         wm831x_irq_exit(wm831x);
-        regmap_exit(wm831x->regmap);
 }
 
 int wm831x_device_suspend(struct wm831x *wm831x)
diff --git a/drivers/mfd/wm831x-i2c.c b/drivers/mfd/wm831x-i2c.c
index cb15609b0a48..2b29caebc9cf 100644
--- a/drivers/mfd/wm831x-i2c.c
+++ b/drivers/mfd/wm831x-i2c.c
@@ -37,7 +37,7 @@ static int wm831x_i2c_probe(struct i2c_client *i2c,
         i2c_set_clientdata(i2c, wm831x);
         wm831x->dev = &i2c->dev;
 
-        wm831x->regmap = regmap_init_i2c(i2c, &wm831x_regmap_config);
+        wm831x->regmap = devm_regmap_init_i2c(i2c, &wm831x_regmap_config);
         if (IS_ERR(wm831x->regmap)) {
                 ret = PTR_ERR(wm831x->regmap);
                 dev_err(wm831x->dev, "Failed to allocate register map: %d\n",
diff --git a/drivers/mfd/wm831x-spi.c b/drivers/mfd/wm831x-spi.c
index 62ef3254105f..745c87945664 100644
--- a/drivers/mfd/wm831x-spi.c
+++ b/drivers/mfd/wm831x-spi.c
@@ -40,7 +40,7 @@ static int __devinit wm831x_spi_probe(struct spi_device *spi)
         dev_set_drvdata(&spi->dev, wm831x);
         wm831x->dev = &spi->dev;
 
-        wm831x->regmap = regmap_init_spi(spi, &wm831x_regmap_config);
+        wm831x->regmap = devm_regmap_init_spi(spi, &wm831x_regmap_config);
         if (IS_ERR(wm831x->regmap)) {
                 ret = PTR_ERR(wm831x->regmap);
                 dev_err(wm831x->dev, "Failed to allocate register map: %d\n",
diff --git a/drivers/mfd/wm8400-core.c b/drivers/mfd/wm8400-core.c
index 2204893444a6..237764ae5f9b 100644
--- a/drivers/mfd/wm8400-core.c
+++ b/drivers/mfd/wm8400-core.c
@@ -350,7 +350,7 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
                 goto err;
         }
 
-        wm8400->regmap = regmap_init_i2c(i2c, &wm8400_regmap_config);
+        wm8400->regmap = devm_regmap_init_i2c(i2c, &wm8400_regmap_config);
         if (IS_ERR(wm8400->regmap)) {
                 ret = PTR_ERR(wm8400->regmap);
                 goto err;
@@ -361,12 +361,10 @@ static int wm8400_i2c_probe(struct i2c_client *i2c,
 
         ret = wm8400_init(wm8400, i2c->dev.platform_data);
         if (ret != 0)
-                goto map_err;
+                goto err;
 
         return 0;
 
-map_err:
-        regmap_exit(wm8400->regmap);
 err:
         return ret;
 }
@@ -376,7 +374,6 @@ static int wm8400_i2c_remove(struct i2c_client *i2c)
         struct wm8400 *wm8400 = i2c_get_clientdata(i2c);
 
         wm8400_release(wm8400);
-        regmap_exit(wm8400->regmap);
 
         return 0;
 }
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index a04b3c108c8c..98733d408fee 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -359,15 +359,38 @@ static int wm8994_ldo_in_use(struct wm8994_pdata *pdata, int ldo)
 }
 #endif
 
+static const __devinitdata struct reg_default wm8994_revc_patch[] = {
+        { 0x102, 0x3 },
+        { 0x56, 0x3 },
+        { 0x817, 0x0 },
+        { 0x102, 0x0 },
+};
+
+static const __devinitdata struct reg_default wm8958_reva_patch[] = {
+        { 0x102, 0x3 },
+        { 0xcb, 0x81 },
+        { 0x817, 0x0 },
+        { 0x102, 0x0 },
+};
+
+static const __devinitdata struct reg_default wm1811_reva_patch[] = {
+        { 0x102, 0x3 },
+        { 0x56, 0x7 },
+        { 0x5d, 0x7e },
+        { 0x5e, 0x0 },
+        { 0x102, 0x0 },
+};
+
 /*
  * Instantiate the generic non-control parts of the device.
  */
-static int wm8994_device_init(struct wm8994 *wm8994, int irq)
+static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq)
 {
         struct wm8994_pdata *pdata = wm8994->dev->platform_data;
         struct regmap_config *regmap_config;
+        const struct reg_default *regmap_patch = NULL;
         const char *devname;
-        int ret, i;
+        int ret, i, patch_regs;
         int pulls = 0;
 
         dev_set_drvdata(wm8994->dev, wm8994);
@@ -379,7 +402,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                               NULL, 0);
         if (ret != 0) {
                 dev_err(wm8994->dev, "Failed to add children: %d\n", ret);
-                goto err_regmap;
+                goto err;
         }
 
         switch (wm8994->type) {
@@ -394,7 +417,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                 break;
         default:
                 BUG();
-                goto err_regmap;
+                goto err;
         }
 
         wm8994->supplies = devm_kzalloc(wm8994->dev,
@@ -402,7 +425,7 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                                         wm8994->num_supplies, GFP_KERNEL);
         if (!wm8994->supplies) {
                 ret = -ENOMEM;
-                goto err_regmap;
+                goto err;
         }
 
         switch (wm8994->type) {
@@ -420,14 +443,14 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                 break;
         default:
                 BUG();
-                goto err_regmap;
+                goto err;
         }
                 
         ret = regulator_bulk_get(wm8994->dev, wm8994->num_supplies,
                                  wm8994->supplies);
         if (ret != 0) {
                 dev_err(wm8994->dev, "Failed to get supplies: %d\n", ret);
-                goto err_regmap;
+                goto err;
         }
 
         ret = regulator_bulk_enable(wm8994->num_supplies,
@@ -488,15 +511,44 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                                  "revision %c not fully supported\n",
                                  'A' + wm8994->revision);
                         break;
+                case 2:
+                case 3:
+                        regmap_patch = wm8994_revc_patch;
+                        patch_regs = ARRAY_SIZE(wm8994_revc_patch);
+                        break;
+                default:
+                        break;
+                }
+                break;
+
+        case WM8958:
+                switch (wm8994->revision) {
+                case 0:
+                        regmap_patch = wm8958_reva_patch;
+                        patch_regs = ARRAY_SIZE(wm8958_reva_patch);
+                        break;
                 default:
                         break;
                 }
                 break;
+
         case WM1811:
                 /* Revision C did not change the relevant layer */
                 if (wm8994->revision > 1)
                         wm8994->revision++;
+                switch (wm8994->revision) {
+                case 0:
+                case 1:
+                case 2:
+                case 3:
+                        regmap_patch = wm1811_reva_patch;
+                        patch_regs = ARRAY_SIZE(wm1811_reva_patch);
+                        break;
+                default:
+                        break;
+                }
                 break;
+
         default:
                 break;
         }
@@ -526,6 +578,16 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
                 return ret;
         }
 
+        if (regmap_patch) {
+                ret = regmap_register_patch(wm8994->regmap, regmap_patch,
+                                            patch_regs);
+                if (ret != 0) {
+                        dev_err(wm8994->dev, "Failed to register patch: %d\n",
+                                ret);
+                        goto err;
+                }
+        }
+
         if (pdata) {
                 wm8994->irq_base = pdata->irq_base;
                 wm8994->gpio_base = pdata->gpio_base;
@@ -588,13 +650,12 @@ err_enable:
                                wm8994->supplies);
 err_get:
         regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
-err_regmap:
-        regmap_exit(wm8994->regmap);
+err:
         mfd_remove_devices(wm8994->dev);
         return ret;
 }
 
-static void wm8994_device_exit(struct wm8994 *wm8994)
+static __devexit void wm8994_device_exit(struct wm8994 *wm8994)
 {
         pm_runtime_disable(wm8994->dev);
         mfd_remove_devices(wm8994->dev);
@@ -602,7 +663,6 @@ static void wm8994_device_exit(struct wm8994 *wm8994)
         regulator_bulk_disable(wm8994->num_supplies,
                                wm8994->supplies);
         regulator_bulk_free(wm8994->num_supplies, wm8994->supplies);
-        regmap_exit(wm8994->regmap);
 }
 
 static const struct of_device_id wm8994_of_match[] = {
@@ -613,8 +673,8 @@ static const struct of_device_id wm8994_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, wm8994_of_match);
 
-static int wm8994_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static __devinit int wm8994_i2c_probe(struct i2c_client *i2c,
+                                      const struct i2c_device_id *id)
 {
         struct wm8994 *wm8994;
         int ret;
@@ -628,7 +688,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
         wm8994->irq = i2c->irq;
         wm8994->type = id->driver_data;
 
-        wm8994->regmap = regmap_init_i2c(i2c, &wm8994_base_regmap_config);
+        wm8994->regmap = devm_regmap_init_i2c(i2c, &wm8994_base_regmap_config);
         if (IS_ERR(wm8994->regmap)) {
                 ret = PTR_ERR(wm8994->regmap);
                 dev_err(wm8994->dev, "Failed to allocate register map: %d\n",
@@ -639,7 +699,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
         return wm8994_device_init(wm8994, i2c->irq);
 }
 
-static int wm8994_i2c_remove(struct i2c_client *i2c)
+static __devexit int wm8994_i2c_remove(struct i2c_client *i2c)
 {
         struct wm8994 *wm8994 = i2c_get_clientdata(i2c);
 
@@ -668,7 +728,7 @@ static struct i2c_driver wm8994_i2c_driver = {
                 .of_match_table = wm8994_of_match,
         },
         .probe = wm8994_i2c_probe,
-        .remove = wm8994_i2c_remove,
+        .remove = __devexit_p(wm8994_i2c_remove),
         .id_table = wm8994_i2c_id,
 };