diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:31:09 -0400 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2012-07-25 00:34:40 -0400 |
| commit | 6aeea3ecc33b1f36dbc3b80461d15a7052ae424f (patch) | |
| tree | bbd273e3e0ca76094aed8e9c77e5adfe2b07f779 /include/linux/mfd/tps65910.h | |
| parent | 9844a5524ec532aee826c35e3031637c7fc8287b (diff) | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) | |
Merge remote-tracking branch 'origin' into irqdomain/next
Diffstat (limited to 'include/linux/mfd/tps65910.h')
| -rw-r--r-- | include/linux/mfd/tps65910.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/mfd/tps65910.h b/include/linux/mfd/tps65910.h index dd8dc0a6c462..6c4c478e21a4 100644 --- a/include/linux/mfd/tps65910.h +++ b/include/linux/mfd/tps65910.h | |||
| @@ -880,4 +880,10 @@ static inline int tps65910_reg_clear_bits(struct tps65910 *tps65910, u8 reg, | |||
| 880 | return regmap_update_bits(tps65910->regmap, reg, mask, 0); | 880 | return regmap_update_bits(tps65910->regmap, reg, mask, 0); |
| 881 | } | 881 | } |
| 882 | 882 | ||
| 883 | static inline int tps65910_reg_update_bits(struct tps65910 *tps65910, u8 reg, | ||
| 884 | u8 mask, u8 val) | ||
| 885 | { | ||
| 886 | return regmap_update_bits(tps65910->regmap, reg, mask, val); | ||
| 887 | } | ||
| 888 | |||
| 883 | #endif /* __LINUX_MFD_TPS65910_H */ | 889 | #endif /* __LINUX_MFD_TPS65910_H */ |