summaryrefslogtreecommitdiffstats
path: root/include/linux/regmap.h
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-10-28 13:01:35 -0700
committerMark Brown <broonie@linaro.org>2013-10-28 13:01:35 -0700
commit04bc9ac163a2550c7bc32750ea8dd2e049102be2 (patch)
tree528eb9cf0ada0bd814ecd246a7dbe57e9a122df4 /include/linux/regmap.h
parentc435d5b9b855ca3d06d34e6b6005963cca72786a (diff)
parenta01779f89fc8a2225cb82dca0fc7b8451851cb7b (diff)
downloadop-kernel-dev-04bc9ac163a2550c7bc32750ea8dd2e049102be2.zip
op-kernel-dev-04bc9ac163a2550c7bc32750ea8dd2e049102be2.tar.gz
Merge remote-tracking branch 'regmap/topic/spmi' into regmap-next
Diffstat (limited to 'include/linux/regmap.h')
-rw-r--r--include/linux/regmap.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index f12dca9..e559078 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -23,6 +23,7 @@ struct device;
struct i2c_client;
struct irq_domain;
struct spi_device;
+struct spmi_device;
struct regmap;
struct regmap_range_cfg;
struct regmap_field;
@@ -320,6 +321,8 @@ struct regmap *regmap_init_i2c(struct i2c_client *i2c,
const struct regmap_config *config);
struct regmap *regmap_init_spi(struct spi_device *dev,
const struct regmap_config *config);
+struct regmap *regmap_init_spmi(struct spmi_device *dev,
+ const struct regmap_config *config);
struct regmap *regmap_init_mmio_clk(struct device *dev, const char *clk_id,
void __iomem *regs,
const struct regmap_config *config);
@@ -332,6 +335,8 @@ 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);
+struct regmap *devm_regmap_init_spmi(struct spmi_device *dev,
+ const struct regmap_config *config);
struct regmap *devm_regmap_init_mmio_clk(struct device *dev, const char *clk_id,
void __iomem *regs,
const struct regmap_config *config);
OpenPOWER on IntegriCloud