ARM: S3C64XX: Add s3c64xx support to touchscreen driver
Subsystems (3)
PATCH 5/7 ARM: S3C64XX: Add s3c64xx support to touchscreen driver
This ack's the extra interrupt s3c64xx platforms have in the touchscreen driver.
--- drivers/input/touchscreen/Kconfig | 6 +++--- drivers/input/touchscreen/s3c2410_ts.c | 26 ++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-)
(quoted diff) +0 -0
b/drivers/input/touchscreen/Kconfig
index dfafc76..0378b3d 100644
drivers/input/touchscreen/Kconfig +3 -3
@@ -146,11 +146,11 @@ config TOUCHSCREEN_FUJITSU module will be called fujitsu-ts. config TOUCHSCREEN_S3C2410 - tristate "Samsung S3C2410 touchscreen input driver" - depends on ARCH_S3C2410 + tristate "Samsung S3C touchscreen input driver" + depends on ARCH_S3C2410 || ARCH_S3C64XX select S3C24XX_ADC help - Say Y here if you have the s3c2410 touchscreen. + Say Y here if you have the s3c touchscreen. If unsure, say N.
(quoted diff) +0 -0
b/drivers/input/touchscreen/s3c2410_ts.c
index 0cd0ca6..04c990e 100644
drivers/input/touchscreen/s3c2410_ts.c +17 -0
@@ -40,7 +40,9 @@#include <plat/regs-adc.h> #include <plat/ts.h> +#ifdef PLAT_S3C24XX #include <mach/regs-gpio.h> +#endif #define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
@@ -88,6 +90,12 @@ struct s3c2410ts {static struct s3c2410ts ts; +enum s3c_cpu_type { +TYPE_S3C2410 , +TYPE_S3C2440 , +TYPE_S3C64XX , +}; +/** * s3c2410_ts_connect - configure gpio for s3c2410 systems *
@@ -97,10 +105,12 @@ static struct s3c2410ts ts;*/ static inline void s3c2410_ts_connect (void ) { +#ifdef PLAT_S3C24XX s3c2410_gpio_cfgpin (S3C2410_GPG (12 ),S3C2410_GPG12_XMON );s3c2410_gpio_cfgpin (S3C2410_GPG (13 ), S3C2410_GPG13_nXPON);s3c2410_gpio_cfgpin (S3C2410_GPG (14 ),S3C2410_GPG14_YMON );s3c2410_gpio_cfgpin (S3C2410_GPG (15 ), S3C2410_GPG15_nYPON); +#endif }/**
@@ -169,6 +179,7 @@ static DEFINE_TIMER(touch_timer, touch_timer_fire, 0, 0);*/ static irqreturn_t stylus_irq (int irq,void *dev_id) { +struct platform_device *pdev =to_platform_device (ts.dev);unsigned long data0;unsigned long data1;bool down;
@@ -187,6 +198,12 @@ static irqreturn_t stylus_irq(int irq, void *dev_id)else dev_info (ts.dev,"%s: count=%d\n" , __func__, ts.count); + +if (platform_get_device_id (pdev)->driver_data ==TYPE_S3C64XX ) { +/* Clear pen down/up interrupt */ +writel (0x0 , ts.io +S3C64XX_ADCCLRINTPNDNUP ); + } +return IRQ_HANDLED ; }
@@ -296,7 +313,7 @@ static int __devinit s3c2410ts_probe(struct
platform_device *pdev)
}
/* Configure the touchscreen external FETs on the S3C2410 */
- if (!platform_get_device_id(pdev)->driver_data)
+ if (platform_get_device_id(pdev)->driver_data == TYPE_S3C2410)
s3c2410_ts_connect();
ts.client = s3c_adc_register(pdev, s3c24xx_ts_select,
@@ -418,15 +435,16 @@ static struct dev_pm_ops s3c_ts_pmops = {
#endif
static struct platform_device_id s3cts_driver_ids[] = {
- { "s3c2410-ts", 0 },
- { "s3c2440-ts", 1 },
+ { "s3c2410-ts", TYPE_S3C2410 },
+ { "s3c2440-ts", TYPE_S3C2440 },
+ { "s3c64xx-ts", TYPE_S3C64XX },
{ }
};
MODULE_DEVICE_TABLE(platform, s3cts_driver_ids);
static struct platform_driver s3c_ts_driver = {
.driver = {
- .name = "s3c24xx-ts", + .name = "s3c-ts", .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &s3c_ts_pmops,
Signature · 1 line
1.7.0.1
PATCH 5/7 ARM: S3C64XX: Add s3c64xx support to touchscreen driver
Quoted 1 line · Maurus Cuelenaere
This ack's the extra interrupt s3c64xx platforms have in the touchscreen driver.
This acks, no need for an ' here.
You'd have been better off sayinh:
Add support for the S3C64XX touchscreen to the s3c2410_ts driver, ensuring it compiles and supports the extra features such as the interrupt generation.
Quoted 32 lines
Signed-off-by Maurus Cuelenaere <[email protected]>--- drivers/input/touchscreen/Kconfig | 6 +++--- drivers/input/touchscreen/s3c2410_ts.c | 26 ++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-)drivers/input/touchscreen/Kconfig +3
-3@@ -146,11 +146,11 @@ config TOUCHSCREEN_FUJITSU module will be called fujitsu-ts. config TOUCHSCREEN_S3C2410 - tristate "Samsung S3C2410 touchscreen input driver" - depends on ARCH_S3C2410 + tristate "Samsung S3C touchscreen input driver" + depends on ARCH_S3C2410 || ARCH_S3C64XX select S3C24XX_ADC help - Say Y here if you have the s3c2410 touchscreen. + Say Y here if you have the s3c touchscreen. If unsure, say N.drivers/input/touchscreen/s3c2410_ts.c +0
-0
drivers/input/touchscreen/s3c2410_ts.c line 42
Quoted 3 lines
drivers/input/touchscreen/s3c2410_ts.c +0
-0@@ -40,7 +40,9 @@#include <plat/regs-adc.h> #include <plat/ts.h>
OA> +#ifdef PLAT_S3C24XX
drivers/input/touchscreen/s3c2410_ts.c line 45
Quoted 2 lines
drivers/input/touchscreen/s3c2410_ts.c +1
-0#include <mach/regs-gpio.h> +#endif
hmm, does this correct a compile error?
Quoted 85 lines
drivers/input/touchscreen/s3c2410_ts.c +16
-1#define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))@@ -88,6 +90,12 @@ struct s3c2410ts {static struct s3c2410ts ts; +enum s3c_cpu_type { +TYPE_S3C2410 , +TYPE_S3C2440 , +TYPE_S3C64XX , +}; +/** * s3c2410_ts_connect - configure gpio for s3c2410 systems * @@ -97,10 +105,12 @@ static struct s3c2410ts ts;*/ static inline void s3c2410_ts_connect (void ) { +#ifdef PLAT_S3C24XX s3c2410_gpio_cfgpin (S3C2410_GPG (12 ),S3C2410_GPG12_XMON );s3c2410_gpio_cfgpin (S3C2410_GPG (13 ), S3C2410_GPG13_nXPON);s3c2410_gpio_cfgpin (S3C2410_GPG (14 ),S3C2410_GPG14_YMON );s3c2410_gpio_cfgpin (S3C2410_GPG (15 ), S3C2410_GPG15_nYPON); +#endif }/** @@ -169,6 +179,7 @@ static DEFINE_TIMER(touch_timer, touch_timer_fire, 0, 0);*/ static irqreturn_t stylus_irq (int irq,void *dev_id) { +struct platform_device *pdev =to_platform_device (ts.dev);unsigned long data0;unsigned long data1;bool down;@@ -187,6 +198,12 @@ static irqreturn_t stylus_irq(int irq, void *dev_id)else dev_info (ts.dev,"%s: count=%d\n" , __func__, ts.count); + +if (platform_get_device_id (pdev)->driver_data ==TYPE_S3C64XX ) { +/* Clear pen down/up interrupt */ +writel (0x0 , ts.io +S3C64XX_ADCCLRINTPNDNUP ); + } +return IRQ_HANDLED ; }@@ -296,7 +313,7 @@ static int __devinit s3c2410ts_probe(struct platform_device *pdev) }/* Configure the touchscreen external FETs on the S3C2410 */ -if (!platform_get_device_id (pdev)->driver_data) +if (platform_get_device_id (pdev)->driver_data ==TYPE_S3C2410 )s3c2410_ts_connect ();drivers/input/touchscreen/s3c2410_ts.c +4
-3ts.client = s3c_adc_register(pdev, s3c24xx_ts_select,@@ -418,15 +435,16 @@ static struct dev_pm_ops s3c_ts_pmops = {#endif static struct platform_device_id s3cts_driver_ids[] = { - {"s3c2410-ts" ,0 }, - {"s3c2440-ts" ,1 }, + {"s3c2410-ts" ,TYPE_S3C2410 }, + {"s3c2440-ts" ,TYPE_S3C2440 }, + {"s3c64xx-ts" ,TYPE_S3C64XX }, { } };MODULE_DEVICE_TABLE (platform, s3cts_driver_ids);static struct platform_driver s3c_ts_driver = { .driver = { - .name ="s3c24xx-ts" , + .name ="s3c-ts" , .owner =THIS_MODULE , #ifdef CONFIG_PM .pm = &s3c_ts_pmops,Signature · 5 lines
1.7.0.1 -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Signature · 5 lines
-- Ben Q: What's a light-year? A: One-third less calories than a regular year.
PATCH 5/7 ARM: S3C64XX: Add s3c64xx support to touchscreen driver
Op 08-03-10 21:01, Ben Dooks schreef:
Quoted 11 lines · Maurus Cuelenaere
Quoted 3 lines
This ack's the extra interrupt s3c64xx platforms have in the touchscreen driver.
This acks, no need for an ' here.
You'd have been better off sayinh:
Add support for the S3C64XX touchscreen to the
s3c2410_tsdriver, ensuring it compiles and supports the extra features such as the interrupt generation.
Ok, should I resend this?
Quoted 38 lines
Quoted 32 lines
Signed-off-by Maurus Cuelenaere<[email protected]>--- drivers/input/touchscreen/Kconfig | 6 +++--- drivers/input/touchscreen/s3c2410_ts.c | 26 ++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 7 deletions(-)drivers/input/touchscreen/Kconfig +3
-3@@ -146,11 +146,11 @@ config TOUCHSCREEN_FUJITSU module will be called fujitsu-ts. config TOUCHSCREEN_S3C2410 - tristate "Samsung S3C2410 touchscreen input driver" - depends on ARCH_S3C2410 + tristate "Samsung S3C touchscreen input driver" + depends on ARCH_S3C2410 || ARCH_S3C64XX select S3C24XX_ADC help - Say Y here if you have the s3c2410 touchscreen. + Say Y here if you have the s3c touchscreen. If unsure, say N.drivers/input/touchscreen/s3c2410_ts.c +0
-0drivers/input/touchscreen/s3c2410_ts.c line 43
Quoted 4 lines
drivers/input/touchscreen/s3c2410_ts.c +0
-0@@ -40,7 +40,9 @@#include <plat/regs-adc.h> #include <plat/ts.h> OA> +#ifdef
PLAT_S3C24XX
Quoted 5 lines
drivers/input/touchscreen/s3c2410_ts.c line 46
Quoted 3 lines
drivers/input/touchscreen/s3c2410_ts.c +1
-0#include <mach/regs-gpio.h> +#endif hmm, does this correct a compile error?
It does, this has been mentioned in a previous version of this patch. Last time I checked, this file wasn't available for S3C64xx targets. Also, see below.
Quoted 18 lines
Quoted 18 lines
drivers/input/touchscreen/s3c2410_ts.c +6
-0#define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))@@ -88,6 +90,12 @@ struct s3c2410ts {static struct s3c2410ts ts; +enum s3c_cpu_type { +TYPE_S3C2410 , +TYPE_S3C2440 , +TYPE_S3C64XX , +}; +/** * s3c2410_ts_connect - configure gpio for s3c2410 systems * @@ -97,10 +105,12 @@ static struct s3c2410ts ts;*/ static inline void s3c2410_ts_connect (void )
Quoted 8 lines
drivers/input/touchscreen/s3c2410_ts.c static struct s3c2410ts ts; · line 114
Quoted 8 lines
drivers/input/touchscreen/s3c2410_ts.c +2
-0{ +#ifdef PLAT_S3C24XX s3c2410_gpio_cfgpin (S3C2410_GPG (12 ),S3C2410_GPG12_XMON );s3c2410_gpio_cfgpin (S3C2410_GPG (13 ), S3C2410_GPG13_nXPON);s3c2410_gpio_cfgpin (S3C2410_GPG (14 ),S3C2410_GPG14_YMON );s3c2410_gpio_cfgpin (S3C2410_GPG (15 ), S3C2410_GPG15_nYPON); +#endif }
The s3c2410_gpio_cfgpin() and S3C2410_* aren't defined for S3C64xx builds.
Signature · 1 line
Maurus Cuelenaere