diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 12:43:00 +0900 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-12-10 12:43:00 +0900 |
| commit | 9e218670737e01ef37bd1ac400482462049dfeff (patch) | |
| tree | 84a6552a500127fac1bf860d2766c6a99e1d4827 /include/linux/mfd | |
| parent | f675649e70a494aa13ae695480a3d51bf15dd3e2 (diff) | |
| parent | b87d07b13c779c42e4929e590003c9eb8c2f06fa (diff) | |
| download | talos-obmc-linux-9e218670737e01ef37bd1ac400482462049dfeff.tar.gz talos-obmc-linux-9e218670737e01ef37bd1ac400482462049dfeff.zip | |
Merge remote-tracking branch 'regulator/topic/max8997' into regulator-next
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 830152cfae33..6ae21bf47d64 100644 --- a/include/linux/mfd/max8997-private.h +++ b/include/linux/mfd/max8997-private.h @@ -316,6 +316,7 @@ enum max8997_irq { #define MAX8997_NUM_GPIO 12 struct max8997_dev { struct device *dev; + struct max8997_platform_data *pdata; struct i2c_client *i2c; /* 0xcc / PMIC, Battery Control, and FLASH */ struct i2c_client *rtc; /* slave addr 0x0c */ struct i2c_client *haptic; /* slave addr 0x90 */ diff --git a/include/linux/mfd/max8997.h b/include/linux/mfd/max8997.h index 328d8e24b533..1d4a4fe6ac33 100644 --- a/include/linux/mfd/max8997.h +++ b/include/linux/mfd/max8997.h @@ -75,6 +75,7 @@ enum max8998_regulators { struct max8997_regulator_data { int id; struct regulator_init_data *initdata; + struct device_node *reg_node; }; enum max8997_muic_usb_type { |
