summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2012-01-30 15:08:16 +0100
committerLokesh Pathak <lpathak@nvidia.com>2012-03-05 07:59:15 -0800
commit096f635bbc06c97e90b70e1722f05ec1facfb622 (patch)
tree98df8741b389dcb5a2ebcd2e3317917aba57a397 /drivers/base
parentb8c04fab23eb0a2b891410acbc180efb02606295 (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> (cherry picked from commit 4191f19792bf91267835eb090d970e9cd6277a65) Change-Id: Iff0be114904ada151315750fdd92ba562dab6314 Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Reviewed-on: http://git-master/r/87584
Diffstat (limited to 'drivers/base')
-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 ece53a4fe4d9..5107ff2edc31 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)
if (map->max_register && reg > map->max_register)
return false;
+ if (map->format.format_write)
+ return false;
+
if (map->readable_reg)
return map->readable_reg(map->dev, reg);
@@ -44,7 +47,7 @@ bool regmap_readable(struct regmap *map, unsigned int reg)
bool regmap_volatile(struct regmap *map, unsigned int reg)
{
- if (map->max_register && reg > map->max_register)
+ if (!regmap_readable(map, reg))
return false;
if (map->volatile_reg)
@@ -55,7 +58,7 @@ bool regmap_volatile(struct regmap *map, unsigned int reg)
bool regmap_precious(struct regmap *map, unsigned int reg)
{
- if (map->max_register && reg > map->max_register)
+ if (!regmap_readable(map, reg))
return false;
if (map->precious_reg)