diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-28 07:17:06 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-28 07:17:06 -0400 |
| commit | 214c3eee2df902d3f4153e6cf7a7d8a5078d7dc8 (patch) | |
| tree | 04d80aaa1cbabad5711b2fccbd3f01eda27fe76c /include | |
| parent | da51f83fa29ab3c619315fa6d2979df6e67e023b (diff) | |
| parent | 98c5fb1f875732e49ce223ba920204ec57f51511 (diff) | |
Merge remote-tracking branch 'asoc/topic/twl6040' into asoc-next
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/twl6040.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index 94ac944d12f0..7e7fbce7a308 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h | |||
| @@ -125,8 +125,15 @@ | |||
| 125 | 125 | ||
| 126 | #define TWL6040_HSDACENA (1 << 0) | 126 | #define TWL6040_HSDACENA (1 << 0) |
| 127 | #define TWL6040_HSDACMODE (1 << 1) | 127 | #define TWL6040_HSDACMODE (1 << 1) |
| 128 | #define TWL6040_HSDRVENA (1 << 2) | ||
| 128 | #define TWL6040_HSDRVMODE (1 << 3) | 129 | #define TWL6040_HSDRVMODE (1 << 3) |
| 129 | 130 | ||
| 131 | /* HFLCTL/R (0x14/0x16) fields */ | ||
| 132 | |||
| 133 | #define TWL6040_HFDACENA (1 << 0) | ||
| 134 | #define TWL6040_HFPGAENA (1 << 1) | ||
| 135 | #define TWL6040_HFDRVENA (1 << 4) | ||
| 136 | |||
| 130 | /* VIBCTLL/R (0x18/0x1A) fields */ | 137 | /* VIBCTLL/R (0x18/0x1A) fields */ |
| 131 | 138 | ||
| 132 | #define TWL6040_VIBENA (1 << 0) | 139 | #define TWL6040_VIBENA (1 << 0) |