2 files changed, 21 insertions, 1 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index abd04932917b..2ec3095ffb7b 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>
@@ -24,6 +25,8 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 #include <linux/regulator/machine.h>
+#include <linux/mfd/tps6507x.h>
+#include <linux/input/tps6507x-ts.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -533,10 +536,24 @@ struct regulator_init_data tps65070_regulator_data[] = {
         },
 };
 
+static struct touchscreen_init_data tps6507x_touchscreen_data = {
+        .poll_period =  30,     /* ms between touch samples */
+        .min_pressure = 0x30,   /* minimum pressure to trigger touch */
+        .vref = 0,              /* turn off vref when not using A/D */
+        .vendor = 0,            /* /sys/class/input/input?/id/vendor */
+        .product = 65070,       /* /sys/class/input/input?/id/product */
+        .version = 0x100,       /* /sys/class/input/input?/id/version */
+};
+
+static struct tps6507x_board tps_board = {
+        .tps6507x_pmic_init_data = &tps65070_regulator_data[0],
+        .tps6507x_ts_init_data = &tps6507x_touchscreen_data,
+};
+
 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/arch/arm/mach-davinci/include/mach/mmc.h b/arch/arm/mach-davinci/include/mach/mmc.h
index 5a85e24f3673..d4f1e9675069 100644
--- a/arch/arm/mach-davinci/include/mach/mmc.h
+++ b/arch/arm/mach-davinci/include/mach/mmc.h
@@ -22,6 +22,9 @@ struct davinci_mmc_config {
 
         /* Version of the MMC/SD controller */
         u8      version;
+
+        /* Number of sg segments */
+        u8      nr_sg;
 };
 void davinci_setup_mmc(int module, struct davinci_mmc_config *config);