diff options
Diffstat (limited to 'include/linux/i2c')
-rw-r--r-- | include/linux/i2c/twl.h | 12 | ||||
-rw-r--r-- | include/linux/i2c/twl4030-madc.h | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/linux/i2c/twl.h b/include/linux/i2c/twl.h index ade1c06d4ceb..d2b16704624c 100644 --- a/include/linux/i2c/twl.h +++ b/include/linux/i2c/twl.h | |||
@@ -195,6 +195,18 @@ static inline int twl_i2c_read_u8(u8 mod_no, u8 *val, u8 reg) { | |||
195 | return twl_i2c_read(mod_no, val, reg, 1); | 195 | return twl_i2c_read(mod_no, val, reg, 1); |
196 | } | 196 | } |
197 | 197 | ||
198 | static inline int twl_i2c_write_u16(u8 mod_no, u16 val, u8 reg) { | ||
199 | val = cpu_to_le16(val); | ||
200 | return twl_i2c_write(mod_no, (u8*) &val, reg, 2); | ||
201 | } | ||
202 | |||
203 | static inline int twl_i2c_read_u16(u8 mod_no, u16 *val, u8 reg) { | ||
204 | int ret; | ||
205 | ret = twl_i2c_read(mod_no, (u8*) val, reg, 2); | ||
206 | *val = le16_to_cpu(*val); | ||
207 | return ret; | ||
208 | } | ||
209 | |||
198 | int twl_get_type(void); | 210 | int twl_get_type(void); |
199 | int twl_get_version(void); | 211 | int twl_get_version(void); |
200 | int twl_get_hfclk_rate(void); | 212 | int twl_get_hfclk_rate(void); |
diff --git a/include/linux/i2c/twl4030-madc.h b/include/linux/i2c/twl4030-madc.h index 01f595107048..1c0134dd3271 100644 --- a/include/linux/i2c/twl4030-madc.h +++ b/include/linux/i2c/twl4030-madc.h | |||
@@ -44,7 +44,7 @@ struct twl4030_madc_conversion_method { | |||
44 | 44 | ||
45 | struct twl4030_madc_request { | 45 | struct twl4030_madc_request { |
46 | unsigned long channels; | 46 | unsigned long channels; |
47 | u16 do_avg; | 47 | bool do_avg; |
48 | u16 method; | 48 | u16 method; |
49 | u16 type; | 49 | u16 type; |
50 | bool active; | 50 | bool active; |