diff options
| author | Mark Brown <broonie@linaro.org> | 2014-01-08 07:46:36 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-01-08 07:46:36 -0500 |
| commit | 258549c06803da30acf0971807c985bf83db8491 (patch) | |
| tree | 4068a178d54b787a594de18181468dc7b5e571aa /include/linux | |
| parent | 6ce4eac1f600b34f2f7f58f9cd8f0503d79e42ae (diff) | |
| parent | 9146070089cca0fa5c396f1a4d0b96d675004c04 (diff) | |
Merge tag 'ib-asoc-3.14.2' of git://git.linaro.org/people/ljones/mfd into asoc-tlw4030
Immutable branch between MFD and ASoC due for the v3.14 merge window
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/i2c/twl.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index 673a3ce67f31..a09da0910339 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
| @@ -175,6 +175,9 @@ static inline int twl_class_is_ ##class(void) \ | |||
| 175 | TWL_CLASS_IS(4030, TWL4030_CLASS_ID) | 175 | TWL_CLASS_IS(4030, TWL4030_CLASS_ID) |
| 176 | TWL_CLASS_IS(6030, TWL6030_CLASS_ID) | 176 | TWL_CLASS_IS(6030, TWL6030_CLASS_ID) |
| 177 | 177 | ||
| 178 | /* Set the regcache bypass for the regmap associated with the nodule */ | ||
| 179 | int twl_set_regcache_bypass(u8 mod_no, bool enable); | ||
| 180 | |||
| 178 | /* | 181 | /* |
| 179 | * Read and write several 8-bit registers at once. | 182 | * Read and write several 8-bit registers at once. |
| 180 | */ | 183 | */ |