aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base/regmap/regmap.c
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2012-01-30 09:08:16 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-01-30 11:23:11 -0500
commit4191f19792bf91267835eb090d970e9cd6277a65 (patch)
treeef01c8d48b3d6fd9c3f1bbffb4a77c7560c1d4d5 /drivers/base/regmap/regmap.c
parentc212acccc368a087a53559aac2b7d3be941b1252 (diff)
regmap: if format_write is used, declare all registers as "unreadable"
Using .format_write means, we have a custom function to write to the chip, but not to read back. Also, mark registers as "not precious" and "not volatile" which is implicit because we cannot read them. Make those functions use 'regmap_readable' to reuse the checks done there. Signed-off-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'drivers/base/regmap/regmap.c')
-rw-r--r--drivers/base/regmap/regmap.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 3c34526091da..b7198f57b69c 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -36,6 +36,9 @@ bool regmap_readable(struct regmap *map, unsigned int reg)
36 if (map->max_register && reg > map->max_register) 36 if (map->max_register && reg > map->max_register)
37 return false; 37 return false;
38 38
39 if (map->format.format_write)
40 return false;
41
39 if (map->readable_reg) 42 if (map->readable_reg)
40 return map->readable_reg(map->dev, reg); 43 return map->readable_reg(map->dev, reg);
41 44
@@ -44,7 +47,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg)
44 47
45bool regmap_volatile(struct regmap *map, unsigned int reg) 48bool regmap_volatile(struct regmap *map, unsigned int reg)
46{ 49{
47 if (map->max_register && reg > map->max_register) 50 if (!regmap_readable(map, reg))
48 return false; 51 return false;
49 52
50 if (map->volatile_reg) 53 if (map->volatile_reg)
@@ -55,7 +58,7 @@ bool regmap_volatile(struct regmap *map, unsigned int reg)
55 58
56bool regmap_precious(struct regmap *map, unsigned int reg) 59bool regmap_precious(struct regmap *map, unsigned int reg)
57{ 60{
58 if (map->max_register && reg > map->max_register) 61 if (!regmap_readable(map, reg))
59 return false; 62 return false;
60 63
61 if (map->precious_reg) 64 if (map->precious_reg)