summaryrefslogtreecommitdiffstats
path: root/include/linux/regmap.h
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2016-02-15 05:23:55 +0000
committerMark Brown <broonie@kernel.org>2016-02-20 01:15:56 +0900
commit28972eaa34f384eef5e33f36e00d8fa21ca44375 (patch)
tree113f7dc3080e7fd4744a89438ae14cd4bec48191 /include/linux/regmap.h
parent89d8d4b833b0b29e0e95bd0cd51e80f5ee7a6b0a (diff)
downloadlinux-stable-28972eaa34f384eef5e33f36e00d8fa21ca44375.tar.gz
linux-stable-28972eaa34f384eef5e33f36e00d8fa21ca44375.tar.bz2
linux-stable-28972eaa34f384eef5e33f36e00d8fa21ca44375.zip
regmap: add regmap_field_update_bits_base()
This patch adds new regmap_field_update_bits_base() which is using regmap_update_bits_base(). Current regmap_field_xxx() can be merged into it by macro. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r--include/linux/regmap.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 4d8e1edb4407..23bf7657e485 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -773,9 +773,11 @@ void devm_regmap_field_free(struct device *dev, struct regmap_field *field);
int regmap_field_read(struct regmap_field *field, unsigned int *val);
int regmap_field_write(struct regmap_field *field, unsigned int val);
+int regmap_field_update_bits_base(struct regmap_field *field,
+ unsigned int mask, unsigned int val,
+ bool *change, bool async, bool force);
int regmap_field_update_bits(struct regmap_field *field,
unsigned int mask, unsigned int val);
-
int regmap_fields_write(struct regmap_field *field, unsigned int id,
unsigned int val);
int regmap_fields_force_write(struct regmap_field *field, unsigned int id,
@@ -954,6 +956,14 @@ static inline int regmap_write_bits(struct regmap *map, unsigned int reg,
return -EINVAL;
}
+static inline int regmap_field_update_bits_base(struct regmap_field *field,
+ unsigned int mask, unsigned int val,
+ bool *change, bool async, bool force)
+{
+ WARN_ONCE(1, "regmap API is disabled");
+ return -EINVAL;
+}
+
static inline int regmap_get_val_bytes(struct regmap *map)
{
WARN_ONCE(1, "regmap API is disabled");