3 files changed, 29 insertions, 3 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index abd04932917b..95adfd42d0e6 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -17,6 +17,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c/at24.h>
 #include <linux/i2c/pca953x.h>
+#include <linux/mfd/tps6507x.h>
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
@@ -533,10 +534,14 @@ struct regulator_init_data tps65070_regulator_data[] = {
         },
 };
 
+static struct tps6507x_board tps_board = {
+        .tps6507x_pmic_init_data = &tps65070_regulator_data[0],
+};
+
 static struct i2c_board_info __initdata da850evm_tps65070_info[] = {
         {
                 I2C_BOARD_INFO("tps6507x", 0x48),
-                .platform_data = &tps65070_regulator_data[0],
+                .platform_data = &tps_board,
         },
 };
 
diff --git a/drivers/regulator/tps6507x-regulator.c b/drivers/regulator/tps6507x-regulator.c
index 23c0597ab1f5..c3f1bf822fd0 100644
--- a/drivers/regulator/tps6507x-regulator.c
+++ b/drivers/regulator/tps6507x-regulator.c
@@ -489,6 +489,7 @@ static int __devinit tps_6507x_probe(struct i2c_client *client,
         struct regulator_init_data *init_data;
         struct regulator_dev *rdev;
         struct tps_pmic *tps;
+        struct tps6507x_board *tps_board;
         int i;
         int error;
 
@@ -497,12 +498,21 @@ static int __devinit tps_6507x_probe(struct i2c_client *client,
                 return -EIO;
 
         /**
+         * tps_board points to pmic related constants
+         * coming from the board-evm file.
+         */
+
+        tps_board = dev_get_platdata(&client->dev);
+        if (!tps_board)
+                return -EINVAL;
+
+        /**
          * init_data points to array of regulator_init structures
          * coming from the board-evm file.
          */
-        init_data = client->dev.platform_data;
+        init_data = tps_board->tps6507x_pmic_init_data;
         if (!init_data)
-                return -EIO;
+                return -EINVAL;
 
         tps = kzalloc(sizeof(*tps), GFP_KERNEL);
         if (!tps)
diff --git a/include/linux/mfd/tps6507x.h b/include/linux/mfd/tps6507x.h
index 155bee1f7823..fd73af5fb95a 100644
--- a/include/linux/mfd/tps6507x.h
+++ b/include/linux/mfd/tps6507x.h
@@ -131,4 +131,15 @@
 /* VDCDC MASK */
 #define TPS6507X_DEFDCDCX_DCDC_MASK             0X3F
 
+/**
+ * struct tps6507x_board - packages regulator and touchscreen init data
+ * @tps6507x_regulator_data: regulator initialization values
+ *
+ * Board data may be used to initialize regulator and touchscreen.
+ */
+
+struct tps6507x_board {
+        struct regulator_init_data *tps6507x_pmic_init_data;
+};
+
 #endif /*  __LINUX_MFD_TPS6507X_H */