summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-20 21:21:25 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-20 21:21:25 +0000
commit3bf06a1ad9b147ca3a64b119d70c4a7c0ace3695 (patch)
tree7e3e546895c3734bfcf36b237aa6609576a8586d /include/linux
parentb01543dfe67bb1d191998e90d20534dc354de059 (diff)
parentc0eb46766d395da8d62148bda2e59bad5e6ee2f2 (diff)
downloadlinux-3bf06a1ad9b147ca3a64b119d70c4a7c0ace3695.tar.gz
linux-3bf06a1ad9b147ca3a64b119d70c4a7c0ace3695.tar.bz2
linux-3bf06a1ad9b147ca3a64b119d70c4a7c0ace3695.zip
Merge branch 'topic/devm' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-drivers
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/regmap.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index eb93921cdd30..195db51ec79b 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -127,6 +127,14 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c,
struct regmap *regmap_init_spi(struct spi_device *dev,
const struct regmap_config *config);
+struct regmap *devm_regmap_init(struct device *dev,
+ const struct regmap_bus *bus,
+ const struct regmap_config *config);
+struct regmap *devm_regmap_init_i2c(struct i2c_client *i2c,
+ const struct regmap_config *config);
+struct regmap *devm_regmap_init_spi(struct spi_device *dev,
+ const struct regmap_config *config);
+
void regmap_exit(struct regmap *map);
int regmap_reinit_cache(struct regmap *map,
const struct regmap_config *config);