diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/da9052/da9052.h | 1 | ||||
| -rw-r--r-- | include/linux/regmap.h | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mfd/da9052/da9052.h b/include/linux/mfd/da9052/da9052.h index 7ffbd6e9e7fc..8313cd9658e3 100644 --- a/include/linux/mfd/da9052/da9052.h +++ b/include/linux/mfd/da9052/da9052.h | |||
| @@ -80,6 +80,7 @@ struct da9052 { | |||
| 80 | struct regmap *regmap; | 80 | struct regmap *regmap; |
| 81 | 81 | ||
| 82 | int irq_base; | 82 | int irq_base; |
| 83 | struct regmap_irq_chip_data *irq_data; | ||
| 83 | u8 chip_id; | 84 | u8 chip_id; |
| 84 | 85 | ||
| 85 | int chip_irq; | 86 | int chip_irq; |
diff --git a/include/linux/regmap.h b/include/linux/regmap.h index ae797b142aa8..9dbc9a1bec43 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h | |||
| @@ -170,6 +170,7 @@ struct regmap *devm_regmap_init_mmio(struct device *dev, | |||
| 170 | void regmap_exit(struct regmap *map); | 170 | void regmap_exit(struct regmap *map); |
| 171 | int regmap_reinit_cache(struct regmap *map, | 171 | int regmap_reinit_cache(struct regmap *map, |
| 172 | const struct regmap_config *config); | 172 | const struct regmap_config *config); |
| 173 | struct regmap *dev_get_regmap(struct device *dev, const char *name); | ||
| 173 | int regmap_write(struct regmap *map, unsigned int reg, unsigned int val); | 174 | int regmap_write(struct regmap *map, unsigned int reg, unsigned int val); |
| 174 | int regmap_raw_write(struct regmap *map, unsigned int reg, | 175 | int regmap_raw_write(struct regmap *map, unsigned int reg, |
| 175 | const void *val, size_t val_len); | 176 | const void *val, size_t val_len); |
| @@ -354,6 +355,13 @@ static inline int regmap_register_patch(struct regmap *map, | |||
| 354 | return -EINVAL; | 355 | return -EINVAL; |
| 355 | } | 356 | } |
| 356 | 357 | ||
| 358 | static inline struct regmap *dev_get_regmap(struct device *dev, | ||
| 359 | const char *name) | ||
| 360 | { | ||
| 361 | WARN_ONCE(1, "regmap API is disabled"); | ||
| 362 | return NULL; | ||
| 363 | } | ||
| 364 | |||
| 357 | #endif | 365 | #endif |
| 358 | 366 | ||
| 359 | #endif | 367 | #endif |
