diff options
| author | merge <null@invalid> | 2008-12-29 12:11:49 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-12-29 12:11:49 +0000 |
| commit | 4f0d7f43b8a9d35be25f520834bbb13f2dae10f3 (patch) | |
| tree | c75c07e7c55a1004996754651484514e7530d38e /arch | |
| parent | 39a497b0421174c3f23ef3dffb0675a4db3aa3a0 (diff) | |
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>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/gta02-moredrivers-defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/gta02-packaging-defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/mach-s3c2440/mach-gta02.c | 9 |
3 files changed, 11 insertions, 0 deletions
diff --git a/arch/arm/configs/gta02-moredrivers-defconfig b/arch/arm/configs/gta02-moredrivers-defconfig index 0d67185a2b3..9294b536473 100644 --- a/arch/arm/configs/gta02-moredrivers-defconfig +++ b/arch/arm/configs/gta02-moredrivers-defconfig @@ -983,6 +983,7 @@ CONFIG_TOUCHSCREEN_FILTER=y CONFIG_TOUCHSCREEN_FILTER_GROUP=y CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y CONFIG_TOUCHSCREEN_FILTER_MEAN=y +CONFIG_TOUCHSCREEN_FILTER_LINEAR=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set CONFIG_TOUCHSCREEN_S3C2410=y diff --git a/arch/arm/configs/gta02-packaging-defconfig b/arch/arm/configs/gta02-packaging-defconfig index 0f8ee7e2b60..02560223722 100644 --- a/arch/arm/configs/gta02-packaging-defconfig +++ b/arch/arm/configs/gta02-packaging-defconfig @@ -987,6 +987,7 @@ CONFIG_TOUCHSCREEN_FILTER=y CONFIG_TOUCHSCREEN_FILTER_GROUP=y CONFIG_TOUCHSCREEN_FILTER_MEDIAN=y CONFIG_TOUCHSCREEN_FILTER_MEAN=y +CONFIG_TOUCHSCREEN_FILTER_LINEAR=y # CONFIG_TOUCHSCREEN_ADS7846 is not set # CONFIG_TOUCHSCREEN_FUJITSU is not set CONFIG_TOUCHSCREEN_S3C2410=y 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] = >a02_ts_group_config, [1] = >a02_ts_median_config, [2] = >a02_ts_mean_config, + [3] = >a02_ts_linear_config, }, }; |