diff options
| author | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:11 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-10-24 11:24:11 +0100 |
| commit | 5b2ad46d6eb69a7910a02ce32e977b48897b1ff4 (patch) | |
| tree | db1f83dd08c939398706639fd3767a3421100b2b /include | |
| parent | c0840b272839eabe7bf23b82d235cfd22d3417a9 (diff) | |
| parent | 92eba04e4bcd469518cc759ac1bf1a49acaa5cc1 (diff) | |
| download | linux-5b2ad46d6eb69a7910a02ce32e977b48897b1ff4.tar.bz2 | |
Merge remote-tracking branch 'asoc/topic/rcar' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 13 | ||||
| -rw-r--r-- | include/sound/rcar_snd.h | 1 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 114565befbd2..dc90b8c134a1 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -431,11 +431,15 @@ bool regmap_reg_in_ranges(unsigned int reg, * @reg: Offset of the register within the regmap bank * @lsb: lsb of the register field. * @reg: msb of the register field. + * @id_size: port size if it has some ports + * @id_offset: address offset for each ports */ struct reg_field { unsigned int reg; unsigned int lsb; unsigned int msb; + unsigned int id_size; + unsigned int id_offset; }; #define REG_FIELD(_reg, _lsb, _msb) { \ @@ -454,6 +458,15 @@ void devm_regmap_field_free(struct device *dev, struct regmap_field *field); int regmap_field_read(struct regmap_field *field, unsigned int *val); int regmap_field_write(struct regmap_field *field, unsigned int val); +int regmap_field_update_bits(struct regmap_field *field, + unsigned int mask, unsigned int val); + +int regmap_fields_write(struct regmap_field *field, unsigned int id, + unsigned int val); +int regmap_fields_read(struct regmap_field *field, unsigned int id, + unsigned int *val); +int regmap_fields_update_bits(struct regmap_field *field, unsigned int id, + unsigned int mask, unsigned int val); /** * Description of an IRQ for the generic regmap irq_chip. diff --git a/include/sound/rcar_snd.h b/include/sound/rcar_snd.h index fb0a312bcb81..12afab18945d 100644 --- a/include/sound/rcar_snd.h +++ b/include/sound/rcar_snd.h @@ -36,7 +36,6 @@ #define RSND_SSI_CLK_PIN_SHARE (1 << 31) #define RSND_SSI_CLK_FROM_ADG (1 << 30) /* clock parent is master */ #define RSND_SSI_SYNC (1 << 29) /* SSI34_sync etc */ -#define RSND_SSI_DEPENDENT (1 << 28) /* SSI needs SRU/SCU */ #define RSND_SSI_PLAY (1 << 24) |