[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1316082879-21810-7-git-send-email-dp@opensource.wolfsonmicro.com>
Date: Thu, 15 Sep 2011 11:34:39 +0100
From: Dimitris Papastamos <dp@...nsource.wolfsonmicro.com>
To: linux-kernel@...r.kernel.org
Cc: Mark Brown <broonie@...nsource.wolfsonmicro.com>,
Liam Girdwood <lrg@...com>,
Graeme Gregory <gg@...mlogic.co.uk>,
Samuel Oritz <sameo@...ux.intel.com>,
Lars-Peter Clausen <lars@...afoo.de>
Subject: [PATCH 6/6 v3] regmap: Incorporate the regcache core into regmap
This patch incorporates the regcache core code into regmap. All previous
patches have been no-ops essentially up to this point.
The bulk read operation is not supported by regcache at the moment. This
will be implemented incrementally.
Signed-off-by: Dimitris Papastamos <dp@...nsource.wolfsonmicro.com>
---
drivers/base/regmap/regmap.c | 46 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 46 insertions(+), 0 deletions(-)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index fa2bd89..6858932 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -146,6 +146,13 @@ struct regmap *regmap_init(struct device *dev,
map->readable_reg = config->readable_reg;
map->volatile_reg = config->volatile_reg;
map->precious_reg = config->precious_reg;
+ map->cache_type = config->cache_type;
+ map->cache_defaults = config->cache_defaults;
+ map->num_cache_defaults = config->num_cache_defaults;
+ map->num_cache_defaults_raw = config->num_cache_defaults_raw;
+ map->cache_defaults_raw = config->cache_defaults_raw;
+ map->cache_size_raw = (config->val_bits / 8) * config->num_cache_defaults_raw;
+ map->cache_word_size = config->val_bits / 8;
switch (config->reg_bits) {
case 4:
@@ -201,6 +208,10 @@ struct regmap *regmap_init(struct device *dev,
goto err_bus;
}
+ ret = regcache_init(map);
+ if (ret < 0)
+ goto err_bus;
+
regmap_debugfs_init(map);
return map;
@@ -219,6 +230,7 @@ EXPORT_SYMBOL_GPL(regmap_init);
*/
void regmap_exit(struct regmap *map)
{
+ regcache_exit(map);
regmap_debugfs_exit(map);
kfree(map->work_buf);
module_put(map->bus->owner);
@@ -321,6 +333,18 @@ int regmap_write(struct regmap *map, unsigned int reg, unsigned int val)
mutex_lock(&map->lock);
+ if (!map->cache_bypass) {
+ ret = regcache_write(map, reg, val);
+ if (ret < 0) {
+ mutex_unlock(&map->lock);
+ return ret;
+ }
+ if (map->cache_only) {
+ mutex_unlock(&map->lock);
+ return 0;
+ }
+ }
+
ret = _regmap_write(map, reg, val);
mutex_unlock(&map->lock);
@@ -422,6 +446,14 @@ int regmap_read(struct regmap *map, unsigned int reg, unsigned int *val)
mutex_lock(&map->lock);
+ if (!map->cache_bypass) {
+ ret = regcache_read(map, reg, val);
+ if (!ret) {
+ mutex_unlock(&map->lock);
+ return 0;
+ }
+ }
+
ret = _regmap_read(map, reg, val);
mutex_unlock(&map->lock);
@@ -473,6 +505,8 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val,
int ret, i;
size_t val_bytes = map->format.val_bytes;
+ WARN_ON(map->cache_type != REGCACHE_NONE);
+
if (!map->format.parse_val)
return -EINVAL;
@@ -512,6 +546,18 @@ int regmap_update_bits(struct regmap *map, unsigned int reg,
tmp &= ~mask;
tmp |= val & mask;
+ if (!map->cache_bypass) {
+ ret = regcache_write(map, reg, tmp);
+ if (ret < 0) {
+ mutex_unlock(&map->lock);
+ return ret;
+ }
+ if (map->cache_only) {
+ mutex_unlock(&map->lock);
+ return 0;
+ }
+ }
+
ret = _regmap_write(map, reg, tmp);
out:
--
1.7.6.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists