diff options
author | Haojian Zhuang <haojian.zhuang@gmail.com> | 2012-09-21 06:06:52 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-10-02 05:43:13 -0400 |
commit | 2e57d56747e601b3e0ff6697e524025d0504d161 (patch) | |
tree | 29a7c677878d39f64e90dfbdf7063a11c08d4c15 /include/linux/mfd/88pm860x.h | |
parent | 837c8293ba24d08cd7438d82ad9bb8d2fb0f8a5b (diff) |
mfd: 88pm860x: Device tree support
Signed-off-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include/linux/mfd/88pm860x.h')
-rw-r--r-- | include/linux/mfd/88pm860x.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mfd/88pm860x.h b/include/linux/mfd/88pm860x.h index d515e5c438f0..ef3e6b701179 100644 --- a/include/linux/mfd/88pm860x.h +++ b/include/linux/mfd/88pm860x.h | |||
@@ -306,7 +306,7 @@ struct pm860x_chip { | |||
306 | struct regmap *regmap_companion; | 306 | struct regmap *regmap_companion; |
307 | 307 | ||
308 | int buck3_double; /* DVC ramp slope double */ | 308 | int buck3_double; /* DVC ramp slope double */ |
309 | unsigned short companion_addr; | 309 | int companion_addr; |
310 | unsigned short osc_vote; | 310 | unsigned short osc_vote; |
311 | int id; | 311 | int id; |
312 | int irq_mode; | 312 | int irq_mode; |
@@ -376,7 +376,7 @@ struct pm860x_platform_data { | |||
376 | struct regulator_init_data *ldo_vibrator; | 376 | struct regulator_init_data *ldo_vibrator; |
377 | struct regulator_init_data *ldo14; | 377 | struct regulator_init_data *ldo14; |
378 | 378 | ||
379 | unsigned short companion_addr; /* I2C address of companion chip */ | 379 | int companion_addr; /* I2C address of companion chip */ |
380 | int i2c_port; /* Controlled by GI2C or PI2C */ | 380 | int i2c_port; /* Controlled by GI2C or PI2C */ |
381 | int irq_mode; /* Clear interrupt by read/write(0/1) */ | 381 | int irq_mode; /* Clear interrupt by read/write(0/1) */ |
382 | int irq_base; /* IRQ base number of 88pm860x */ | 382 | int irq_base; /* IRQ base number of 88pm860x */ |