Merge remote-tracking branch 'regmap/topic/introspection' into regmap…

…-next Simple add/add conflict: drivers/base/regmap/regmap.c
git-mirror · Mar 14, 2012 · eae4b51 · eae4b51
2 parents 4a6be7b + a6539c3
commit eae4b51
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 0 deletions.
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
@@ -844,6 +844,21 @@ int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
 }
 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
@@ -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,