Merge remote-tracking branches 'regmap/topic/patch' and 'regmap/topic/sync' into...

[mv-sheeva.git] / drivers / base / regmap / regcache.c

diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index 8db713ffef66eed4eb4739f90af93eed4b616d7d..fb84d711fbb4098f51fdff33a2681b6c655bf5df 100644 (file)
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -252,12 +252,11 @@ int regcache_write(struct regmap *map,
 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 */
@@ -282,24 +281,11 @@ int regcache_sync(struct regmap *map)
        }
        map->cache_bypass = 0;
 
-       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 +296,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
  *