Merge branch 'topic/cache' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into HEAD

5 files changed, 61 insertions, 3 deletions

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..854448d09293 100644
--- a/drivers/base/regmap/regcache-lzo.c
+++ b/drivers/base/regmap/regcache-lzo.c
@@ -351,7 +351,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..579e85b8a684 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -231,6 +231,39 @@ err:
 EXPORT_SYMBOL_GPL(regmap_init);
 
 /**
+ * regmap_reinit_cache(): Reinitialise the current register cache
+ *
+ * @map: Register map to operate on.
+ * @config: New configuration.  Only the cache data will be used.
+ *
+ * Discard any existing register cache for the map and initialize a
+ * new cache.  This can be used to restore the cache to defaults or to
+ * update the cache configuration to reflect runtime discovery of the
+ * hardware.
+ */
+int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
+{
+        int ret;
+
+        mutex_lock(&map->lock);
+
+        regcache_exit(map);
+
+        map->max_register = config->max_register;
+        map->writeable_reg = config->writeable_reg;
+        map->readable_reg = config->readable_reg;
+        map->volatile_reg = config->volatile_reg;
+        map->precious_reg = config->precious_reg;
+        map->cache_type = config->cache_type;
+
+        ret = regcache_init(map, config);
+
+        mutex_unlock(&map->lock);
+
+        return ret;
+}
+
+/**
  * regmap_exit(): Free a previously allocated register map
  */
 void regmap_exit(struct regmap *map)
@@ -306,8 +339,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);
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 690276a642cf..86923a98a766 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
 };
 
 /**
@@ -129,6 +129,8 @@ struct regmap *regmap_init_spi(struct spi_device *dev,
                                const struct regmap_config *config);
 
 void regmap_exit(struct regmap *map);
+int regmap_reinit_cache(struct regmap *map,
+                        const struct regmap_config *config);
 int regmap_write(struct regmap *map, unsigned int reg, unsigned int val);
 int regmap_raw_write(struct regmap *map, unsigned int reg,
                      const void *val, size_t val_len);
@@ -143,5 +145,6 @@ 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);
 
 #endif