diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:24 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 00:22:24 +0900 |
| commit | 719454d213f6e857b527e965eb6a1c8390cfc9b9 (patch) | |
| tree | bc453dea9f803244ea3b0b4c3390e32fb9daf396 /include | |
| parent | ac92f112947d6d8c43a6e040f5e5bca87786832a (diff) | |
| parent | f55ec27f48a833febe8c78453bac55bb14e2cc4a (diff) | |
| download | linux-719454d213f6e857b527e965eb6a1c8390cfc9b9.tar.gz linux-719454d213f6e857b527e965eb6a1c8390cfc9b9.tar.bz2 linux-719454d213f6e857b527e965eb6a1c8390cfc9b9.zip | |
Merge remote-tracking branch 'asoc/topic/wm2200' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 6 |
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; |