summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-14 13:15:03 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-03-14 13:15:03 +0000
commiteae4b51b21f7452b0b53a9848f48c02cb0fac336 (patch)
tree20d54023bf32e061866c83565d44d694e2598ba5
parent4a6be7bb7474500a69f6d8f25899b8038491bdbb (diff)
parenta6539c32949063c8147905512a83a98842c2d254 (diff)
downloadop-kernel-dev-eae4b51b21f7452b0b53a9848f48c02cb0fac336.zip
op-kernel-dev-eae4b51b21f7452b0b53a9848f48c02cb0fac336.tar.gz
Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next
Simple add/add conflict: drivers/base/regmap/regmap.c
-rw-r--r--drivers/base/regmap/regmap.c15
-rw-r--r--include/linux/regmap.h1
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index e3ee9ca..2f7c25c 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -844,6 +844,21 @@ out:
}
EXPORT_SYMBOL_GPL(regmap_register_patch);
+/*
+ * regmap_get_val_bytes(): Report the size of a register value
+ *
+ * Report the size of a register value, mainly intended to for use by
+ * generic infrastructure built on top of regmap.
+ */
+int regmap_get_val_bytes(struct regmap *map)
+{
+ if (map->format.format_write)
+ return -EINVAL;
+
+ return map->format.val_bytes;
+}
+EXPORT_SYMBOL_GPL(regmap_get_val_bytes);
+
static int __init regmap_initcall(void)
{
regmap_debugfs_initcall();
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index bb13efc..398377d 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -156,6 +156,7 @@ int regmap_update_bits(struct regmap *map, unsigned int reg,
int regmap_update_bits_check(struct regmap *map, unsigned int reg,
unsigned int mask, unsigned int val,
bool *change);
+int regmap_get_val_bytes(struct regmap *map);
int regcache_sync(struct regmap *map);
int regcache_sync_region(struct regmap *map, unsigned int min,
OpenPOWER on IntegriCloud