Merge remote-tracking branch 'regmap/topic/introspection' into regmap-next
Simple add/add conflict:
drivers/base/regmap/regmap.c
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 @@
}
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();