6 files changed, 38 insertions, 11 deletions

diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile
index ce2d18a6465b..3dbe5d3ff227 100644
--- a/drivers/base/regmap/Makefile
+++ b/drivers/base/regmap/Makefile
@@ -1,4 +1,5 @@
-obj-$(CONFIG_REGMAP) += regmap.o regcache.o regcache-indexed.o regcache-rbtree.o regcache-lzo.o
+obj-$(CONFIG_REGMAP) += regmap.o regcache.o regcache-indexed.o
+obj-$(CONFIG_REGMAP) += regcache-rbtree.o regcache-lzo.o
 obj-$(CONFIG_DEBUG_FS) += regmap-debugfs.o
 obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o
 obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o
diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 348ff02eb93e..6483e0bda0cf 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -74,6 +74,7 @@ struct regmap {
         struct reg_default *reg_defaults;
         const void *reg_defaults_raw;
         void *cache;
+        bool cache_dirty;
 };
 
 struct regcache_ops {
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c
index 066aeece3626..226ffc13bc25 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -27,7 +27,7 @@ struct regcache_lzo_ctx {
 };
 
 #define LZO_BLOCK_NUM 8
-static int regcache_lzo_block_count(void)
+static int regcache_lzo_block_count(struct regmap *map)
 {
         return LZO_BLOCK_NUM;
 }
@@ -106,19 +106,22 @@ static inline int regcache_lzo_get_blkindex(struct regmap *map,
                                             unsigned int reg)
 {
         return (reg * map->cache_word_size) /
-                DIV_ROUND_UP(map->cache_size_raw, regcache_lzo_block_count());
+                DIV_ROUND_UP(map->cache_size_raw,
+                             regcache_lzo_block_count(map));
 }
 
 static inline int regcache_lzo_get_blkpos(struct regmap *map,
                                           unsigned int reg)
 {
-        return reg % (DIV_ROUND_UP(map->cache_size_raw, regcache_lzo_block_count()) /
+        return reg % (DIV_ROUND_UP(map->cache_size_raw,
+                                   regcache_lzo_block_count(map)) /
                       map->cache_word_size);
 }
 
 static inline int regcache_lzo_get_blksize(struct regmap *map)
 {
-        return DIV_ROUND_UP(map->cache_size_raw, regcache_lzo_block_count());
+        return DIV_ROUND_UP(map->cache_size_raw,
+                            regcache_lzo_block_count(map));
 }
 
 static int regcache_lzo_init(struct regmap *map)
@@ -131,7 +134,7 @@ static int regcache_lzo_init(struct regmap *map)
 
         ret = 0;
 
-        blkcount = regcache_lzo_block_count();
+        blkcount = regcache_lzo_block_count(map);
         map->cache = kzalloc(blkcount * sizeof *lzo_blocks,
                              GFP_KERNEL);
         if (!map->cache)
@@ -203,7 +206,7 @@ static int regcache_lzo_exit(struct regmap *map)
         if (!lzo_blocks)
                 return 0;
 
-        blkcount = regcache_lzo_block_count();
+        blkcount = regcache_lzo_block_count(map);
         /*
          * the pointer to the bitmap used for syncing the cache
          * is shared amongst all lzo_blocks.  Ensure it is freed
@@ -351,7 +354,7 @@ static int regcache_lzo_sync(struct regmap *map)
 }
 
 struct regcache_ops regcache_lzo_ops = {
-        .type = REGCACHE_LZO,
+        .type = REGCACHE_COMPRESSED,
         .name = "lzo",
         .init = regcache_lzo_init,
         .exit = regcache_lzo_exit,
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 666f6f5011dc..6ab9f0384d82 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -241,6 +241,8 @@ int regcache_sync(struct regmap *map)
                 map->cache_ops->name);
         name = map->cache_ops->name;
         trace_regcache_sync(map->dev, name, "start");
+        if (!map->cache_dirty)
+                goto out;
         if (map->cache_ops->sync) {
                 ret = map->cache_ops->sync(map);
         } else {
@@ -291,6 +293,23 @@ void regcache_cache_only(struct regmap *map, bool enable)
 EXPORT_SYMBOL_GPL(regcache_cache_only);
 
 /**
+ * regcache_mark_dirty: Mark the register cache as dirty
+ *
+ * @map: map to mark
+ *
+ * Mark the register cache as dirty, for example due to the device
+ * having been powered down for suspend.  If the cache is not marked
+ * as dirty then the cache sync will be suppressed.
+ */
+void regcache_mark_dirty(struct regmap *map)
+{
+        mutex_lock(&map->lock);
+        map->cache_dirty = true;
+        mutex_unlock(&map->lock);
+}
+EXPORT_SYMBOL_GPL(regcache_mark_dirty);
+
+/**
  * regcache_cache_bypass: Put a register map into cache bypass mode
  *
  * @map: map to configure
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index bf441db1ee90..f7cfff2b8714 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -306,8 +306,10 @@ int _regmap_write(struct regmap *map, unsigned int reg,
                 ret = regcache_write(map, reg, val);
                 if (ret != 0)
                         return ret;
-                if (map->cache_only)
+                if (map->cache_only) {
+                        map->cache_dirty = true;
                         return 0;
+                }
         }
 
         trace_regmap_reg_write(map->dev, reg, val);
@@ -547,7 +549,7 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
 EXPORT_SYMBOL_GPL(regmap_bulk_read);
 
 /**
- * remap_update_bits: Perform a read/modify/write cycle on the register map
+ * regmap_update_bits: Perform a read/modify/write cycle on the register map
  *
  * @map: Register map to update
  * @reg: Register to update
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index bd54cecdfdf8..1e4ec2b6c2ea 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -25,7 +25,7 @@ enum regcache_type {
         REGCACHE_NONE,
         REGCACHE_INDEXED,
         REGCACHE_RBTREE,
-        REGCACHE_LZO
+        REGCACHE_COMPRESSED
 };
 
 /**
@@ -143,6 +143,7 @@ int regmap_update_bits(struct regmap *map, unsigned int reg,
 int regcache_sync(struct regmap *map);
 void regcache_cache_only(struct regmap *map, bool enable);
 void regcache_cache_bypass(struct regmap *map, bool enable);
+void regcache_mark_dirty(struct regmap *map);
 
 /**
  * Description of an IRQ for the generic regmap irq_chip.