summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 07:39:20 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-11 07:39:20 +0400
commitbcf86687d676fa478c71201294b296126212f06c (patch)
treefe44b787a21b4d474c5417ce378fe3eec91da837 /include
parentd3816c1a0e9ea8e1a04fdf7601837e8c3a0e190e (diff)
parent5166b7c006eeb4f6becc0822974d8da259484ba1 (diff)
downloadlinux-bcf86687d676fa478c71201294b296126212f06c.tar.xz
Merge remote-tracking branch 'regmap/topic/debugfs' into regmap-next
Diffstat (limited to 'include')
-rw-r--r--include/linux/regmap.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index e3bcc3f4dcb8..9f228d7f7ac4 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -133,7 +133,7 @@ struct regmap_config {
enum regmap_endian val_format_endian;
const struct regmap_range_cfg *ranges;
- unsigned int n_ranges;
+ unsigned int num_ranges;
};
/**
@@ -142,6 +142,8 @@ struct regmap_config {
* 1. page selector register update;
* 2. access through data window registers.
*
+ * @name: Descriptive name for diagnostics
+ *
* @range_min: Address of the lowest register address in virtual range.
* @range_max: Address of the highest register in virtual range.
*
@@ -153,6 +155,8 @@ struct regmap_config {
* @window_len: Number of registers in data window.
*/
struct regmap_range_cfg {
+ const char *name;
+
/* Registers of virtual address range */
unsigned int range_min;
unsigned int range_max;