summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 05:35:18 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-12-02 05:35:18 +0100
commit54fc5a1ad81d3c7c7553b6d3dff0fc51d8ac2bbd (patch)
treec08f81b4a947f5cc15e41fe8c3392d6907cb8453 /include
parentMerge remote-tracking branch 'asoc/topic/wm2000' into asoc-next (diff)
parentASoC: wm2200: Remove empty labels (diff)
downloadlinux-54fc5a1ad81d3c7c7553b6d3dff0fc51d8ac2bbd.tar.xz
linux-54fc5a1ad81d3c7c7553b6d3dff0fc51d8ac2bbd.zip
Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-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;