diff options
| author | Lee Jones <lee.jones@linaro.org> | 2016-11-21 12:59:46 +0000 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2016-11-21 12:59:46 +0000 |
| commit | 94662d307598137a93ffe1e3996925b22726b7e0 (patch) | |
| tree | f09cf67588b8bd0feec276a4cb0b4adb9998585d /include/linux | |
| parent | 40a3a0f2ba633fa219f69aef0fd0dcdd6e5756b0 (diff) | |
| parent | 2dc4940360d4c0c38aa9275532c7c0d7542f6258 (diff) | |
| download | linux-94662d307598137a93ffe1e3996925b22726b7e0.tar.gz linux-94662d307598137a93ffe1e3996925b22726b7e0.tar.bz2 linux-94662d307598137a93ffe1e3996925b22726b7e0.zip | |
Merge branches 'ib-mfd-arm-leds-4.10' and 'ib-mfd-gpio-input-regulator-4.10' into ibs-for-mfd-merged
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/mfd/tps65218.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/mfd/tps65218.h b/include/linux/mfd/tps65218.h index d1db9527fab5..bccd2d68b1e3 100644 --- a/include/linux/mfd/tps65218.h +++ b/include/linux/mfd/tps65218.h @@ -282,10 +282,9 @@ struct tps65218 { struct regulator_desc desc[TPS65218_NUM_REGULATOR]; struct tps_info *info[TPS65218_NUM_REGULATOR]; struct regmap *regmap; + u8 *strobes; }; -int tps65218_reg_read(struct tps65218 *tps, unsigned int reg, - unsigned int *val); int tps65218_reg_write(struct tps65218 *tps, unsigned int reg, unsigned int val, unsigned int level); int tps65218_set_bits(struct tps65218 *tps, unsigned int reg, |