diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 09:12:33 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-14 09:12:33 -0400 |
| commit | e1c1c69c8fc7656c33460c8e085ac0d0be22ac3b (patch) | |
| tree | 3199753118adf26baf52841cb913afa77f549829 /include | |
| parent | f5d6eba74b8aac7d4bf646c5445807aa6a247e6c (diff) | |
| parent | c0eb46766d395da8d62148bda2e59bad5e6ee2f2 (diff) | |
Merge remote-tracking branches 'regmap/topic/core' and 'regmap/topic/devm' into regmap-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/regmap.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index 14b8252d8ed0..5b0908a7f5bf 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
| @@ -132,6 +132,14 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c, | |||
| 132 | struct regmap *regmap_init_spi(struct spi_device *dev, | 132 | struct regmap *regmap_init_spi(struct spi_device *dev, |
| 133 | const struct regmap_config *config); | 133 | const struct regmap_config *config); |
| 134 | 134 | ||
| 135 | struct regmap *devm_regmap_init(struct device *dev, | ||
| 136 | const struct regmap_bus *bus, | ||
| 137 | const struct regmap_config *config); | ||
| 138 | struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c, | ||
| 139 | const struct regmap_config *config); | ||
| 140 | struct regmap *devm_regmap_init_spi(struct spi_device *dev, | ||
| 141 | const struct regmap_config *config); | ||
| 142 | |||
| 135 | void regmap_exit(struct regmap *map); | 143 | void regmap_exit(struct regmap *map); |
| 136 | int regmap_reinit_cache(struct regmap *map, | 144 | int regmap_reinit_cache(struct regmap *map, |
| 137 | const struct regmap_config *config); | 145 | const struct regmap_config *config); |