diff options
| author | Thomas Abraham <thomas.abraham@linaro.org> | 2012-11-27 03:34:32 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-11-27 15:05:36 -0500 |
| commit | 77b71b370ed06c75bdebef09be438d5275f70fc1 (patch) | |
| tree | 7a5408e5f954d460712bc0b80f2bfc831bdfa346 /include/linux/mfd | |
| parent | 068a8c8239d50a5fd025c97f94945d9f2ffa3438 (diff) | |
regulator: add device tree support for max8997
Add device tree based discovery support for max8997.
Signed-off-by: Thomas Abraham <thomas.abraham@linaro.org>
Acked-by: MyungJoo Ham <myungjoo.ham@samsung.com>
Reviewed-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/linux/mfd')
| -rw-r--r-- | include/linux/mfd/max8997-private.h | 1 | ||||
| -rw-r--r-- | include/linux/mfd/max8997.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/mfd/max8997-private.h b/include/linux/mfd/max8997-private.h index 830152cfae3..6ae21bf47d6 100644 --- a/include/linux/mfd/max8997-private.h +++ b/include/linux/mfd/max8997-private.h | |||
| @@ -316,6 +316,7 @@ enum max8997_irq { | |||
| 316 | #define MAX8997_NUM_GPIO 12 | 316 | #define MAX8997_NUM_GPIO 12 |
| 317 | struct max8997_dev { | 317 | struct max8997_dev { |
| 318 | struct device *dev; | 318 | struct device *dev; |
| 319 | struct max8997_platform_data *pdata; | ||
| 319 | struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */ | 320 | struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */ |
| 320 | struct i2c_client *rtc; /* slave addr 0x0c */ | 321 | struct i2c_client *rtc; /* slave addr 0x0c */ |
| 321 | struct i2c_client *haptic; /* slave addr 0x90 */ | 322 | struct i2c_client *haptic; /* slave addr 0x90 */ |
diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h index 328d8e24b53..1d4a4fe6ac3 100644 --- a/include/linux/mfd/max8997.h +++ b/include/linux/mfd/max8997.h | |||
| @@ -75,6 +75,7 @@ enum max8998_regulators { | |||
| 75 | struct max8997_regulator_data { | 75 | struct max8997_regulator_data { |
| 76 | int id; | 76 | int id; |
| 77 | struct regulator_init_data *initdata; | 77 | struct regulator_init_data *initdata; |
| 78 | struct device_node *reg_node; | ||
| 78 | }; | 79 | }; |
| 79 | 80 | ||
| 80 | enum max8997_muic_usb_type { | 81 | enum max8997_muic_usb_type { |
