Merge remote-tracking branches 'regmap/topic/cache', 'regmap/topic/irq', 'regmap...

[linux-2.6-block.git] / include / linux / regmap.h

diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index 220aec66006478075d62dfe6a6f9f855caa7c5bd..5ad86eacef0d4c17bae725f9a0eb1ebf09cd48a6 100644 (file)
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -321,6 +321,8 @@ struct regmap *regmap_init(struct device *dev,
                           const struct regmap_bus *bus,
                           void *bus_context,
                           const struct regmap_config *config);
+int regmap_attach_dev(struct device *dev, struct regmap *map,
+                                const struct regmap_config *config);
 struct regmap *regmap_init_i2c(struct i2c_client *i2c,
                               const struct regmap_config *config);
 struct regmap *regmap_init_spi(struct spi_device *dev,
@@ -430,6 +432,8 @@ bool regmap_check_range_table(struct regmap *map, unsigned int reg,
 
 int regmap_register_patch(struct regmap *map, const struct reg_default *regs,
                          int num_regs);
+int regmap_parse_val(struct regmap *map, const void *buf,
+                               unsigned int *val);
 
 static inline bool regmap_reg_in_range(unsigned int reg,
                                       const struct regmap_range *range)
@@ -702,6 +706,13 @@ static inline int regmap_register_patch(struct regmap *map,
        return -EINVAL;
 }
 
+static inline int regmap_parse_val(struct regmap *map, const void *buf,
+                               unsigned int *val)
+{
+       WARN_ONCE(1, "regmap API is disabled");
+       return -EINVAL;
+}
+
 static inline struct regmap *dev_get_regmap(struct device *dev,
                                            const char *name)
 {