summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@linaro.org>2012-11-27 14:04:32 +0530
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-11-27 20:05:36 +0000
commit77b71b370ed06c75bdebef09be438d5275f70fc1 (patch)
tree7a5408e5f954d460712bc0b80f2bfc831bdfa346 /include/linux
parent068a8c8239d50a5fd025c97f94945d9f2ffa3438 (diff)
downloadlinux-stable-77b71b370ed06c75bdebef09be438d5275f70fc1.tar.gz
linux-stable-77b71b370ed06c75bdebef09be438d5275f70fc1.tar.bz2
linux-stable-77b71b370ed06c75bdebef09be438d5275f70fc1.zip
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')
-rw-r--r--include/linux/mfd/max8997-private.h1
-rw-r--r--include/linux/mfd/max8997.h1
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 {