Dear Dmitry,
Thank your for giving me very precious suggestion,
and you have helped me perfect my ts driver.Thanks.
According to your advice,I have modified my patch.
About your some doubt,I explain some following for you:
Base on w90p910 ts spec,the ts can work in two mode,wait trigger mode and
auto-semi mode.When no press acts on LCD,the ts is stll in wait trigger mode,
and if press occurs,the ts can give a WT_INT interrupt,at this time, my driver must catch
this irq and prepare to gain X value,if the X value was obtained successfully,ts will give
a ADC_INT interrupt.When the Y value was obtained successfully,the second ADC_INT interrupt
will be gave.
If we want to gain this X and Y values,we must change the mode to auto-semi mode.
The following code is my driver:
static void w90p910_ts_interrupt(struct w90p910drv_ts *w90p910_ts)
{
/*the section indicates WT_INT occurs,and previous state is NO_PRESS,but current state is having a press. */
if ((__raw_readl(w90p910_ts->ts_reg)&WT_INT) &&
w90p910_ts->state == NO_PRESS) {
w90p910_ts->pendown = 1;
__raw_writel(ADC_TSC_X, w90p910_ts->ts_reg+0x04);
/*change the mode to auto-semi and prepare to gain X value and set this state to CAN_READX*/
__raw_writel((__raw_readl(w90p910_ts->ts_reg)|
ADC_SEMIAUTO|ADC_INT_EN|ADC_CONV),
w90p910_ts->ts_reg);
w90p910_ts->state = CAN_READX;
}
/*I think this section can be called by timer function and to judge if the pen still keep down... */
else {
if (__raw_readl(w90p910_ts->ts_reg+0x04)&ADC_DOWN) {
__raw_writel(ADC_TSC_X, w90p910_ts->ts_reg+0x04);
__raw_writel((__raw_readl(w90p910_ts->ts_reg)|
ADC_SEMIAUTO|ADC_INT_EN|ADC_CONV),
w90p910_ts->ts_reg);
w90p910_ts->pendown = 1;
w90p910_ts->state = CAN_READX;
} else {
__raw_writel((__raw_readl(w90p910_ts->ts_reg)|
ADC_WAITTRIG|WT_INT_EN), w90p910_ts->ts_reg);
w90p910_ts->pendown = 0;
w90p910_ts->state = NO_PRESS;
}
}
/*if the ADC_INT occurs ,at the time,the w90p910_ts->state equal to CAN_READX,
this state indicates X value have been obtained successfully and preparing to gain
Y value.
*/
if ((__raw_readl(w90p910_ts->ts_reg)&ADC_INT) &&
w90p910_ts->state == CAN_READX) {
__raw_writel(ADC_TSC_Y, w90p910_ts->ts_reg+0x04);
__raw_writel((__raw_readl(w90p910_ts->ts_reg)|
ADC_SEMIAUTO|ADC_INT_EN|ADC_CONV), w90p910_ts->ts_reg);
w90p910_ts->state = CAN_READY;
}
/*if another ADC_INT occurs ,at the time,the w90p910_ts->state equal to CAN_READY,
this state indicates X and Y values have been obtained successfully and preparing to submit
those values to user,so I think i must put this w90p910_report_event() here and submit x and y
values to user at the same time.
*/
if ((__raw_readl(w90p910_ts->ts_reg)&ADC_INT) &&
w90p910_ts->state == CAN_READY) {
w90p910_report_event(w90p910_ts);
__raw_writel((__raw_readl(w90p910_ts->ts_reg)|
ADC_WAITTRIG), w90p910_ts->ts_reg);
mod_timer(&w90p910_ts->timer, jiffies +
msecs_to_jiffies(40));
}
}
Mmm,I am a wordy speaker and didn't know if you can understand my idea,
this driver can make my ts works well. :)
---
Add touchscreen drivers for w90p910 platform.
Signed-off-by: Wan ZongShun <mcuos.com@xxxxxxxxx>
diff -Npur linux-2.6.29/drivers/input/touchscreen/Kconfig linux-2.6.30/drivers/input/touchscreen/Kconfig
--- linux-2.6.29/drivers/input/touchscreen/Kconfig 2009-05-01 12:28:54.000000000 +0800
+++ linux-2.6.30/drivers/input/touchscreen/Kconfig 2009-05-10 14:47:07.000000000 +0800
@@ -466,4 +466,11 @@ config TOUCHSCREEN_TSC2007
To compile this driver as a module, choose M here: the
module will be called tsc2007.
+config TOUCHSCREEN_W90X900
+ tristate "W90P910 touchscreen driver"
+ depends on CPU_W90P910
+ help
+ To compile this driver as a module, choose M here: the
+ module will be called w90p910-ts.
+
endif
diff -Npur linux-2.6.29/drivers/input/touchscreen/Makefile linux-2.6.30/drivers/input/touchscreen/Makefile
--- linux-2.6.29/drivers/input/touchscreen/Makefile 2009-05-01 12:28:54.000000000 +0800
+++ linux-2.6.30/drivers/input/touchscreen/Makefile 2009-05-09 07:34:12.000000000 +0800
@@ -37,3 +37,4 @@ wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) +
wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o
obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o
obj-$(CONFIG_TOUCHSCREEN_WM97XX_ZYLONITE) += zylonite-wm97xx.o
+obj-$(CONFIG_TOUCHSCREEN_W90X900) += w90p910_ts.o
diff -Npur linux-2.6.29/drivers/input/touchscreen/w90p910_ts.c linux-2.6.30/drivers/input/touchscreen/w90p910_ts.c
--- linux-2.6.29/drivers/input/touchscreen/w90p910_ts.c 1970-01-01 08:00:00.000000000 +0800
+++ linux-2.6.30/drivers/input/touchscreen/w90p910_ts.c 2009-05-10 15:41:00.000000000 +0800
@@ -0,0 +1,269 @@
+/*
+ * Copyright (c) 2008 Nuvoton technology corporation.
+ *
+ * Wan ZongShun <mcuos.com@xxxxxxxxx>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation;version 2 of the License.
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/io.h>
+#include <linux/input.h>
+#include <linux/interrupt.h>
+
+#include <mach/hardware.h>
+
+/*adc controller bit define*/
+#define ADC_DELAY 0xf00
+#define ADC_DOWN 0x01
+#define ADC_TSC_Y (0x01 << 8)
+#define ADC_TSC_X (0x00 << 8)
+#define TSC_FOURWIRE (~(0x03 << 1))
+#define ADC_CLK_EN (0x01 << 28)/*adc clock*/
+#define ADC_READ_CON (0x01 << 12)
+#define ADC_CONV (0x01 << 13)
+#define ADC_SEMIAUTO (0x01 << 14)
+#define ADC_WAITTRIG (0x03 << 14)
+#define ADC_RST1 (0x01 << 16)
+#define ADC_RST0 (0x00 << 16)
+#define ADC_EN (0x01 << 17)
+#define ADC_INT (0x01 << 18)
+#define WT_INT (0x01 << 20)
+#define ADC_INT_EN (0x01 << 21)
+#define LVD_INT_EN (0x01 << 22)
+#define WT_INT_EN (0x01 << 23)
+#define ADC_DIV (0x04 << 1)/*div=6*/
+
+/*adc state define*/
+enum ts_state { NO_PRESS, CAN_READX, CAN_READY };
+
+struct w90p910drv_ts {
+ struct input_dev *input;
+ struct timer_list timer;
+ int irq_num;
+ int pendown;
+ int clocken;
+ void __iomem *ts_reg;
+ short x;
+ short y;
+ spinlock_t lock;
+ enum ts_state state;
+};
+
+static void w90p910_report_event(struct w90p910drv_ts *w90p910_ts)
+{
+ struct input_dev *dev = w90p910_ts->input;
+
+ w90p910_ts->x = __raw_readl(w90p910_ts->ts_reg+0x0c);
+ w90p910_ts->y = __raw_readl(w90p910_ts->ts_reg+0x10);
+
+ input_report_abs(dev, ABS_X, w90p910_ts->x);
+ input_report_abs(dev, ABS_Y, w90p910_ts->y);
+ input_report_key(dev, BTN_TOUCH, w90p910_ts->pendown);
+ input_sync(dev);
+}
+
+static void w90p910_ts_interrupt(struct w90p910drv_ts *w90p910_ts)
+{
+ if ((__raw_readl(w90p910_ts->ts_reg)&WT_INT) &&
+ w90p910_ts->state == NO_PRESS) {
+ w90p910_ts->pendown = 1;
+ __raw_writel(ADC_TSC_X, w90p910_ts->ts_reg+0x04);
+ __raw_writel((__raw_readl(w90p910_ts->ts_reg)|
+ ADC_SEMIAUTO|ADC_INT_EN|ADC_CONV),
+ w90p910_ts->ts_reg);
+ w90p910_ts->state = CAN_READX;
+ } else {
+ if (__raw_readl(w90p910_ts->ts_reg+0x04)&ADC_DOWN) {
+ __raw_writel(ADC_TSC_X, w90p910_ts->ts_reg+0x04);
+
+ __raw_writel((__raw_readl(w90p910_ts->ts_reg)|
+ ADC_SEMIAUTO|ADC_INT_EN|ADC_CONV),
+ w90p910_ts->ts_reg);
+ w90p910_ts->pendown = 1;
+ w90p910_ts->state = CAN_READX;
+ } else {
+ __raw_writel((__raw_readl(w90p910_ts->ts_reg)|
+ ADC_WAITTRIG|WT_INT_EN), w90p910_ts->ts_reg);
+ w90p910_ts->pendown = 0;
+ w90p910_ts->state = NO_PRESS;
+ }
+ }
+
+ if ((__raw_readl(w90p910_ts->ts_reg)&ADC_INT) &&
+ w90p910_ts->state == CAN_READX) {
+ __raw_writel(ADC_TSC_Y, w90p910_ts->ts_reg+0x04);
+ __raw_writel((__raw_readl(w90p910_ts->ts_reg)|
+ ADC_SEMIAUTO|ADC_INT_EN|ADC_CONV), w90p910_ts->ts_reg);
+ w90p910_ts->state = CAN_READY;
+ }
+
+ if ((__raw_readl(w90p910_ts->ts_reg)&ADC_INT) &&
+ w90p910_ts->state == CAN_READY) {
+ w90p910_report_event(w90p910_ts);
+ __raw_writel((__raw_readl(w90p910_ts->ts_reg)|
+ ADC_WAITTRIG), w90p910_ts->ts_reg);
+ mod_timer(&w90p910_ts->timer, jiffies +
+ msecs_to_jiffies(40));
+ }
+}
+
+static void w90p910_ts_timer(unsigned long data)
+{
+ struct w90p910drv_ts *w90p910_data = (struct w90p910drv_ts *) data;
+ unsigned long flags;
+
+ spin_lock_irqsave(&w90p910_data->lock, flags);
+
+ w90p910_ts_interrupt(w90p910_data);
+
+ spin_unlock_irqrestore(&w90p910_data->lock, flags);
+}
+
+static irqreturn_t ts_interrupt(int irq, void *dev_id)
+{
+ struct w90p910drv_ts *w90p910_data = dev_id;
+
+ w90p910_ts_interrupt(w90p910_data);
+ return IRQ_HANDLED;
+}
+
+static int __devinit w90x900ts_probe(struct platform_device *pdev)
+{
+ struct w90p910drv_ts *w90p910_ts;
+ struct input_dev *input_dev;
+ int err = -ENOMEM;
+ struct resource *res;
+
+ w90p910_ts = kzalloc(sizeof(struct w90p910drv_ts), GFP_KERNEL);
+ input_dev = input_allocate_device();
+ if (!w90p910_ts || !input_dev)
+ goto fail1;
+
+ platform_set_drvdata(pdev, w90p910_ts);
+
+ w90p910_ts->input = input_dev;
+ w90p910_ts->state = NO_PRESS;
+ w90p910_ts->clocken = (int)W90X900_VA_CLKPWR;
+ spin_lock_init(&w90p910_ts->lock);
+ setup_timer(&w90p910_ts->timer, w90p910_ts_timer,
+ (unsigned long)w90p910_ts);
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res) {
+ err = -ENXIO;
+ goto fail1;
+ }
+
+ if (!request_mem_region(res->start, res->end - res->start + 1,
+ pdev->name)) {
+ err = -EBUSY;
+ goto fail1;
+ }
+
+ w90p910_ts->ts_reg = ioremap(res->start, res->end - res->start + 1);
+ if (!w90p910_ts->ts_reg) {
+ err = -ENOMEM;
+ goto fail2;
+ }
+
+ /* enable the ADC clock */
+ __raw_writel(__raw_readl(w90p910_ts->clocken)|ADC_CLK_EN,
+ w90p910_ts->clocken);
+
+ input_dev->name = "W90P910 TouchScreen";
+ input_dev->phys = "w90p910ts/event0";
+ input_dev->id.bustype = BUS_HOST;
+ input_dev->id.vendor = 0x0005;
+ input_dev->id.product = 0x0001;
+ input_dev->id.version = 0x0100;
+ input_dev->dev.parent = &pdev->dev;
+ input_dev->evbit[0] = BIT_MASK(EV_KEY)|
+ BIT_MASK(EV_ABS) | BIT_MASK(EV_SYN);
+ input_dev->keybit[BIT_WORD(BTN_TOUCH)] = BIT_MASK(BTN_TOUCH);
+
+ input_set_abs_params(input_dev, ABS_X, 0, 0x400, 0, 0);
+ input_set_abs_params(input_dev, ABS_Y, 0, 0x400, 0, 0);
+
+ w90p910_ts->irq_num = platform_get_irq(pdev, 0);
+ if (request_irq(w90p910_ts->irq_num, ts_interrupt, IRQF_DISABLED,
+ "w90p910ts", w90p910_ts)) {
+ err = -EBUSY;
+ goto fail3;
+ }
+
+ err = input_register_device(w90p910_ts->input);
+ if (err)
+ goto fail4;
+
+ __raw_writel(ADC_RST1, w90p910_ts->ts_reg);
+ msleep(1);
+ __raw_writel(ADC_RST0, w90p910_ts->ts_reg);
+ msleep(1);
+
+ /* set delay and screen type */
+ __raw_writel(__raw_readl(w90p910_ts->ts_reg+0x04) & TSC_FOURWIRE,
+ (w90p910_ts->ts_reg+0x04));
+ __raw_writel(ADC_DELAY, (w90p910_ts->ts_reg+0x08));
+ /* waitting for trigger mode */
+ __raw_writel((__raw_readl(w90p910_ts->ts_reg)|
+ ADC_WAITTRIG|ADC_DIV|ADC_EN|WT_INT_EN), w90p910_ts->ts_reg);
+ return 0;
+
+fail4: free_irq(w90p910_ts->irq_num, w90p910_ts);
+fail3: iounmap(w90p910_ts->ts_reg);
+fail2: release_mem_region(res->start, res->end - res->start + 1);
+fail1: input_free_device(input_dev);
+ kfree(w90p910_ts);
+ return err;
+}
+
+static int __devexit w90x900ts_remove(struct platform_device *pdev)
+{
+ struct w90p910drv_ts *w90p910_ts = platform_get_drvdata(pdev);
+ struct resource *res;
+
+ free_irq(w90p910_ts->irq_num, w90p910_ts);
+ del_timer_sync(&w90p910_ts->timer);
+ iounmap(w90p910_ts->ts_reg);
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ release_mem_region(res->start, res->end - res->start + 1);
+
+ input_unregister_device(w90p910_ts->input);
+ kfree(w90p910_ts);
+
+ return 0;
+}
+
+static struct platform_driver w90x900ts_driver = {
+ .probe = w90x900ts_probe,
+ .remove = __devexit_p(w90x900ts_remove),
+ .driver = {
+ .name = "w90x900-ts",
+ .owner = THIS_MODULE,
+ },
+};
+
+static int __init w90x900ts_init(void)
+{
+ return platform_driver_register(&w90x900ts_driver);
+}
+
+static void __exit w90x900ts_exit(void)
+{
+ platform_driver_unregister(&w90x900ts_driver);
+}
+
+module_init(w90x900ts_init);
+module_exit(w90x900ts_exit);
+
+MODULE_AUTHOR("Wan ZongShun <mcuos.com@xxxxxxxxx>");
+MODULE_DESCRIPTION("w90p910 touch screen driver!");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:w90p910-ts");
--
To unsubscribe from this list: send the line "unsubscribe linux-input" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
