From 44d9e5b72cb127c3f4cf0def6623d4ace2d8fa92 Mon Sep 17 00:00:00 2001 From: Tim Niemeyer Date: Tue, 14 Apr 2009 19:07:25 +0200 Subject: better naming for filter_configuration this affects gta01 and gta02, now we can enable both in the .config Signed-off-by: Tim Niemeyer --- arch/arm/mach-s3c2442/mach-gta02.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'arch/arm/mach-s3c2442') diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index e1f8b9b2fd6..db2f1704c69 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -986,7 +986,7 @@ const static struct ts_filter_linear_configuration gta02_ts_linear = { }; #endif -const struct ts_filter_chain_configuration filter_configuration[] = +const struct ts_filter_chain_configuration gta02_filter_configuration[] = { #ifdef CONFIG_TOUCHSCREEN_FILTER {&ts_filter_group_api, >a02_ts_group.config}, @@ -1000,7 +1000,7 @@ const struct ts_filter_chain_configuration filter_configuration[] = const static struct s3c2410_ts_mach_info gta02_ts_cfg = { .delay = 10000, .presc = 0xff, /* slow as we can go */ - .filter_config = filter_configuration, + .filter_config = gta02_filter_configuration, }; -- cgit v1.2.3 From 9a690f4a8733bbeeba62ff28ae38ff7f869e4b05 Mon Sep 17 00:00:00 2001 From: Nelson Castillo Date: Wed, 15 Apr 2009 00:21:33 -0500 Subject: make touchscreen filter symbols const static in mach-gta01.c and mach-gta02.c Signed-off-by: Nelson Castillo --- arch/arm/mach-s3c2442/mach-gta02.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-s3c2442') diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index db2f1704c69..079a2cc13b7 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -986,7 +986,7 @@ const static struct ts_filter_linear_configuration gta02_ts_linear = { }; #endif -const struct ts_filter_chain_configuration gta02_filter_configuration[] = +const static struct ts_filter_chain_configuration gta02_filter_configuration[] = { #ifdef CONFIG_TOUCHSCREEN_FILTER {&ts_filter_group_api, >a02_ts_group.config}, -- cgit v1.2.3 From 06fbe40974754ff188612acf0340c1b29400e439 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Thu, 16 Apr 2009 16:04:14 +0400 Subject: gta02: fix re-enabling backlight with <12 values If brightness value was set to anything less than 12, the backlight wasn't re-enabled after unblanking the display. Closes ticket #2262. Signed-off-by: Paul Fertser --- arch/arm/mach-s3c2442/mach-gta02.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'arch/arm/mach-s3c2442') diff --git a/arch/arm/mach-s3c2442/mach-gta02.c b/arch/arm/mach-s3c2442/mach-gta02.c index 079a2cc13b7..d16e9d638c1 100644 --- a/arch/arm/mach-s3c2442/mach-gta02.c +++ b/arch/arm/mach-s3c2442/mach-gta02.c @@ -1027,16 +1027,17 @@ static void gta02_bl_set_intensity(int intensity) return; } - old_intensity = pcf50633_reg_read(pcf, PCF50633_REG_LEDOUT); + if (!(pcf50633_reg_read(pcf, PCF50633_REG_LEDENA) & 3)) + old_intensity = 0; + else + old_intensity = pcf50633_reg_read(pcf, PCF50633_REG_LEDOUT); + if (intensity == old_intensity) return; /* We can't do this anywhere else */ pcf50633_reg_write(pcf, PCF50633_REG_LEDDIM, 5); - if (!(pcf50633_reg_read(pcf, PCF50633_REG_LEDENA) & 3)) - old_intensity = 0; - /* * The PCF50633 cannot handle LEDOUT = 0 (datasheet p60) * if seen, you have to re-enable the LED unit -- cgit v1.2.3