From 3e41e162f47f688c24e3402b961cf5c32f990dd9 Mon Sep 17 00:00:00 2001 From: merge Date: Tue, 2 Dec 2008 10:13:13 +0000 Subject: MERGE-via-pending-tracking-hist-MERGE-via-stable-tracking-add-skip_filter-s3c2410_ts-pat pending-tracking-hist top was MERGE-via-stable-tracking-add-skip_filter-s3c2410_ts-pat / 90805b15390b2c9a56c31eb9722a9704a88c1ad7 ... parent commitmessage: From: merge MERGE-via-stable-tracking-hist-add-skip_filter-s3c2410_ts-pat stable-tracking-hist top was add-skip_filter-s3c2410_ts-pat / d1ee2301175bf55df550fb310b0701645e07e5dd ... parent commitmessage: From: Nelson Castillo add-skip_filter-s3c2410_ts.patch Skip filter for touchscreen values. Problem: The first and the last sample might be unreliable. We provide this filter as a separate function in order to keep the event_send_timer_f function simple. This filter: * Skips NHEAD points after IE_DOWN * Skips NTAIL points before IE_UP * Ignores a click if we have less than (NHEAD + NTAIL + 1) points Right now the filter is embedded in the driver. We have two #defines with the parameters SKIP_NHEAD and SKIP_NTAIL. I didn't store their values in struct skip_filter on purpose. Signed-off-by: Nelson Castillo --- arch/arm/mach-s3c2440/mach-gta02.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'arch/arm/mach-s3c2440') diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c index 2272624a06e..4c4e1dec6ec 100644 --- a/arch/arm/mach-s3c2440/mach-gta02.c +++ b/arch/arm/mach-s3c2440/mach-gta02.c @@ -648,7 +648,6 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .min_uV = 3300000, .max_uV = 3300000, .valid_modes_mask = REGULATOR_MODE_NORMAL, - .boot_on = 1, .apply_uV = 1, .state_mem = { .enabled = 1, @@ -661,7 +660,6 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .min_uV = 1300000, .max_uV = 1600000, .valid_modes_mask = REGULATOR_MODE_NORMAL, - .boot_on = 1, .apply_uV = 1, }, .num_consumer_supplies = 0, @@ -672,7 +670,6 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .max_uV = 1800000, .valid_modes_mask = REGULATOR_MODE_NORMAL, .apply_uV = 1, - .boot_on = 1, .state_mem = { .enabled = 1, }, @@ -685,7 +682,6 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .max_uV = 3300000, .valid_modes_mask = REGULATOR_MODE_NORMAL, .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE, - .boot_on = 1, }, .num_consumer_supplies = 1, .consumer_supplies = hcldo_consumers, @@ -742,6 +738,9 @@ struct pcf50633_platform_data gta02_pcf_pdata = { .min_uV = 0, .max_uV = 3300000, .valid_modes_mask = REGULATOR_MODE_NORMAL, + .state_mem = { + .enabled = 1, + }, }, .num_consumer_supplies = 0, }, @@ -1661,9 +1660,6 @@ static void gta02_pmu_attach_child_devices(struct pcf50633 *pcf) { int n; - /* only now force enable LCM power and codec power */ - pcf-> - for (n = 0; n < ARRAY_SIZE(gta02_devices_pmu_children); n++) gta02_devices_pmu_children[n]->dev.parent = pcf->dev; -- cgit v1.2.3