diff options
Diffstat (limited to 'include/linux/mfd/twl6040.h')
-rw-r--r-- | include/linux/mfd/twl6040.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/include/linux/mfd/twl6040.h b/include/linux/mfd/twl6040.h index ba43d4806b83..a8eff4ad9be5 100644 --- a/include/linux/mfd/twl6040.h +++ b/include/linux/mfd/twl6040.h | |||
@@ -143,7 +143,7 @@ | |||
143 | 143 | ||
144 | #define TWL6040_GPO1 0x01 | 144 | #define TWL6040_GPO1 0x01 |
145 | #define TWL6040_GPO2 0x02 | 145 | #define TWL6040_GPO2 0x02 |
146 | #define TWL6040_GPO3 0x03 | 146 | #define TWL6040_GPO3 0x04 |
147 | 147 | ||
148 | /* ACCCTL (0x2D) fields */ | 148 | /* ACCCTL (0x2D) fields */ |
149 | 149 | ||
@@ -158,7 +158,7 @@ | |||
158 | #define TWL6040_VIBROCDET 0x20 | 158 | #define TWL6040_VIBROCDET 0x20 |
159 | #define TWL6040_TSHUTDET 0x40 | 159 | #define TWL6040_TSHUTDET 0x40 |
160 | 160 | ||
161 | #define TWL6040_CELLS 2 | 161 | #define TWL6040_CELLS 3 |
162 | 162 | ||
163 | #define TWL6040_REV_ES1_0 0x00 | 163 | #define TWL6040_REV_ES1_0 0x00 |
164 | #define TWL6040_REV_ES1_1 0x01 /* Rev ES1.1 and ES1.2 */ | 164 | #define TWL6040_REV_ES1_1 0x01 /* Rev ES1.1 and ES1.2 */ |
@@ -176,6 +176,8 @@ | |||
176 | #define TWL6040_SYSCLK_SEL_LPPLL 0 | 176 | #define TWL6040_SYSCLK_SEL_LPPLL 0 |
177 | #define TWL6040_SYSCLK_SEL_HPPLL 1 | 177 | #define TWL6040_SYSCLK_SEL_HPPLL 1 |
178 | 178 | ||
179 | #define TWL6040_GPO_MAX 3 | ||
180 | |||
179 | struct twl6040_codec_data { | 181 | struct twl6040_codec_data { |
180 | u16 hs_left_step; | 182 | u16 hs_left_step; |
181 | u16 hs_right_step; | 183 | u16 hs_right_step; |
@@ -192,11 +194,16 @@ struct twl6040_vibra_data { | |||
192 | int vddvibr_uV; /* VDDVIBR volt, set 0 for fixed reg */ | 194 | int vddvibr_uV; /* VDDVIBR volt, set 0 for fixed reg */ |
193 | }; | 195 | }; |
194 | 196 | ||
197 | struct twl6040_gpo_data { | ||
198 | int gpio_base; | ||
199 | }; | ||
200 | |||
195 | struct twl6040_platform_data { | 201 | struct twl6040_platform_data { |
196 | int audpwron_gpio; /* audio power-on gpio */ | 202 | int audpwron_gpio; /* audio power-on gpio */ |
197 | 203 | ||
198 | struct twl6040_codec_data *codec; | 204 | struct twl6040_codec_data *codec; |
199 | struct twl6040_vibra_data *vibra; | 205 | struct twl6040_vibra_data *vibra; |
206 | struct twl6040_gpo_data *gpo; | ||
200 | }; | 207 | }; |
201 | 208 | ||
202 | struct regmap; | 209 | struct regmap; |