summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2013-06-25 16:08:10 +0200
committerChanho Park <chanho61.park@samsung.com>2014-03-20 17:34:49 +0900
commit864b62600ae70a2e29b3dbaae25b05c76332d662 (patch)
tree98f3641a51bb0fff69062af65817aceff6a07da7 /include/linux
parentb55a709341478f8135fde8aa3464e5a178dcc5fe (diff)
downloadlinux-3.10-864b62600ae70a2e29b3dbaae25b05c76332d662.tar.gz
linux-3.10-864b62600ae70a2e29b3dbaae25b05c76332d662.tar.bz2
linux-3.10-864b62600ae70a2e29b3dbaae25b05c76332d662.zip
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/linux')
-rw-r--r--include/linux/mfd/max8998-private.h2
-rw-r--r--include/linux/mfd/max8998.h2
2 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/mfd/max8998-private.h b/include/linux/mfd/max8998-private.h
index bfb48b6fcc7..84844e0a570 100644
--- a/include/linux/mfd/max8998-private.h
+++ b/include/linux/mfd/max8998-private.h
@@ -137,6 +137,7 @@ struct irq_domain;
/**
* struct max8998_dev - max8998 master device for sub-drivers
* @dev: master device of the chip (can be used to access platform data)
+ * @pdata: platform data for the driver and subdrivers
* @i2c: i2c client private data for regulator
* @rtc: i2c client private data for rtc
* @iolock: mutex for serializing io access
@@ -150,6 +151,7 @@ struct irq_domain;
*/
struct max8998_dev {
struct device *dev;
+ struct max8998_platform_data *pdata;
struct i2c_client *i2c;
struct i2c_client *rtc;
struct mutex iolock;
diff --git a/include/linux/mfd/max8998.h b/include/linux/mfd/max8998.h
index ca56bb03bc6..e3956a654cb 100644
--- a/include/linux/mfd/max8998.h
+++ b/include/linux/mfd/max8998.h
@@ -58,10 +58,12 @@ enum {
* max8998_regulator_data - regulator data
* @id: regulator id
* @initdata: regulator init data (contraints, supplies, ...)
+ * @reg_node: DT node of regulator (unused on non-DT platforms)
*/
struct max8998_regulator_data {
int id;
struct regulator_init_data *initdata;
+ struct device_node *reg_node;
};
/**