MERGE-via-pending-tracking-hist-this-patch-gets-the-linux-mci-

pending-tracking-hist top was this-patch-gets-the-linux-mci- / f45f6d893a0dc65a6041a2c0127e9970427a85da ... parent commitmessage:
From: Balaji Rao <balajirrao@openmoko.org>
This patch gets the Linux mci stack to use the voltage it negotiated before

with the uSD card on resume.  Without this, it always reverts to and stays at
3.3V.

Signed-off-by: Balaji Rao <balajirrao@openmoko.org>

1 files changed, 9 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
index dc0ef0f2a5b..7e70f82bebc 100644
--- a/arch/arm/mach-s3c2440/mach-gta02.c
+++ b/arch/arm/mach-s3c2440/mach-gta02.c
@@ -103,6 +103,7 @@
 
 #include "../plat-s3c24xx/neo1973_pm_gps.h"
 
+#include <linux/ts_filter_linear.h>
 #include <linux/ts_filter_mean.h>
 #include <linux/ts_filter_median.h>
 #include <linux/ts_filter_group.h>
@@ -1008,6 +1009,12 @@ static struct s3c2410_udc_mach_info gta02_udc_cfg = {
 
 /* touchscreen configuration */
 
+static struct ts_filter_linear_configuration gta02_ts_linear_config = {
+	.constants = {1, 0, 0, 0, 1, 0, 1},	/* don't modify coords */
+	.coord0 = 0,
+	.coord1 = 1,
+};
+
 static struct ts_filter_group_configuration gta02_ts_group_config = {
 	.extent = 12,
 	.close_enough = 10,
@@ -1033,11 +1040,13 @@ static struct s3c2410_ts_mach_info gta02_ts_cfg = {
 		[0] = &ts_filter_group_api,
 		[1] = &ts_filter_median_api,
 		[2] = &ts_filter_mean_api,
+		[3] = &ts_filter_linear_api,
 	},
 	.filter_config = {
 		[0] = &gta02_ts_group_config,
 		[1] = &gta02_ts_median_config,
 		[2] = &gta02_ts_mean_config,
+		[3] = &gta02_ts_linear_config,
 	},
 };