diff options
author | Tomasz Figa <t.figa@samsung.com> | 2013-06-25 10:08:10 -0400 |
---|---|---|
committer | Samuel Ortiz <sameo@linux.intel.com> | 2013-06-30 17:30:04 -0400 |
commit | ee999fb3f17faa3af6028bf7130707fe0d4157a4 (patch) | |
tree | 9cbadb66c7a3f84c265fd2f7f10801385a7ea50b /include | |
parent | 4280e0b42bd590316a048d66ea356e78c5d0464e (diff) |
mfd: max8998: Add support for Device Tree
This patch adds Device Tree support to max8998 driver.
Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Acked-by: Mark Brown <broonie@linaro.org>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/mfd/max8998-private.h | 2 | ||||
-rw-r--r-- | include/linux/mfd/max8998.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mfd/max8998-private.h b/include/linux/mfd/max8998-private.h index bfb48b6fcc74..84844e0a5704 100644 --- a/include/linux/mfd/max8998-private.h +++ b/include/linux/mfd/max8998-private.h | |||
@@ -137,6 +137,7 @@ struct irq_domain; | |||
137 | /** | 137 | /** |
138 | * struct max8998_dev - max8998 master device for sub-drivers | 138 | * struct max8998_dev - max8998 master device for sub-drivers |
139 | * @dev: master device of the chip (can be used to access platform data) | 139 | * @dev: master device of the chip (can be used to access platform data) |
140 | * @pdata: platform data for the driver and subdrivers | ||
140 | * @i2c: i2c client private data for regulator | 141 | * @i2c: i2c client private data for regulator |
141 | * @rtc: i2c client private data for rtc | 142 | * @rtc: i2c client private data for rtc |
142 | * @iolock: mutex for serializing io access | 143 | * @iolock: mutex for serializing io access |
@@ -150,6 +151,7 @@ struct irq_domain; | |||
150 | */ | 151 | */ |
151 | struct max8998_dev { | 152 | struct max8998_dev { |
152 | struct device *dev; | 153 | struct device *dev; |
154 | struct max8998_platform_data *pdata; | ||
153 | struct i2c_client *i2c; | 155 | struct i2c_client *i2c; |
154 | struct i2c_client *rtc; | 156 | struct i2c_client *rtc; |
155 | struct mutex iolock; | 157 | struct mutex iolock; |
diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h index ca56bb03bc69..e3956a654cbc 100644 --- a/include/linux/mfd/max8998.h +++ b/include/linux/mfd/max8998.h | |||
@@ -58,10 +58,12 @@ enum { | |||
58 | * max8998_regulator_data - regulator data | 58 | * max8998_regulator_data - regulator data |
59 | * @id: regulator id | 59 | * @id: regulator id |
60 | * @initdata: regulator init data (contraints, supplies, ...) | 60 | * @initdata: regulator init data (contraints, supplies, ...) |
61 | * @reg_node: DT node of regulator (unused on non-DT platforms) | ||
61 | */ | 62 | */ |
62 | struct max8998_regulator_data { | 63 | struct max8998_regulator_data { |
63 | int id; | 64 | int id; |
64 | struct regulator_init_data *initdata; | 65 | struct regulator_init_data *initdata; |
66 | struct device_node *reg_node; | ||
65 | }; | 67 | }; |
66 | 68 | ||
67 | /** | 69 | /** |