Commit f5b313a2 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branch 'regmap/topic/cache' into regmap-next

parents 45942c31 f29a4320
...@@ -269,8 +269,11 @@ static int regcache_default_sync(struct regmap *map, unsigned int min, ...@@ -269,8 +269,11 @@ static int regcache_default_sync(struct regmap *map, unsigned int min,
map->cache_bypass = 1; map->cache_bypass = 1;
ret = _regmap_write(map, reg, val); ret = _regmap_write(map, reg, val);
map->cache_bypass = 0; map->cache_bypass = 0;
if (ret) if (ret) {
dev_err(map->dev, "Unable to sync register %#x. %d\n",
reg, ret);
return ret; return ret;
}
dev_dbg(map->dev, "Synced register %#x, value %#x\n", reg, val); dev_dbg(map->dev, "Synced register %#x, value %#x\n", reg, val);
} }
...@@ -615,8 +618,11 @@ static int regcache_sync_block_single(struct regmap *map, void *block, ...@@ -615,8 +618,11 @@ static int regcache_sync_block_single(struct regmap *map, void *block,
ret = _regmap_write(map, regtmp, val); ret = _regmap_write(map, regtmp, val);
map->cache_bypass = 0; map->cache_bypass = 0;
if (ret != 0) if (ret != 0) {
dev_err(map->dev, "Unable to sync register %#x. %d\n",
regtmp, ret);
return ret; return ret;
}
dev_dbg(map->dev, "Synced register %#x, value %#x\n", dev_dbg(map->dev, "Synced register %#x, value %#x\n",
regtmp, val); regtmp, val);
} }
...@@ -641,6 +647,9 @@ static int regcache_sync_block_raw_flush(struct regmap *map, const void **data, ...@@ -641,6 +647,9 @@ static int regcache_sync_block_raw_flush(struct regmap *map, const void **data,
map->cache_bypass = 1; map->cache_bypass = 1;
ret = _regmap_raw_write(map, base, *data, count * val_bytes); ret = _regmap_raw_write(map, base, *data, count * val_bytes);
if (ret)
dev_err(map->dev, "Unable to sync registers %#x-%#x. %d\n",
base, cur - map->reg_stride, ret);
map->cache_bypass = 0; map->cache_bypass = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment