full.patch

2.6.12 内核版本的patch

+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Copyright (c) 2005 Arnaud Patard <[e-mail]>
+ * Samsung S3C2410 keyboard support
+ *
+ * Based on various pxa ipaq drivers.
+ * 
+ * ChangeLog
+ *
+ * 2005-06-21: Arnaud Patard <[e-mail]>
+ *      - Initial version
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/device.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include <asm/arch/regs-gpio.h>
+
+/* For id.version */
+#define S3C2410KBDVERSION	0x0001
+#define DRV_NAME		"s3c2410-kbd"
+
+MODULE_AUTHOR("Arnaud Patard <[e-mail]>");
+MODULE_DESCRIPTION("s3c2410 keyboard driver");
+MODULE_LICENSE("GPL");
+
+struct s3c2410kbd_button {
+	int irq;
+	int pin;
+	int pin_setting;
+	int keycode;
+	char *name;
+};
+
+/* To be moved later to a better place */
+static struct s3c2410kbd_button s3c2410kbd_buttons[] = {
+	{  IRQ_EINT0,  S3C2410_GPF0,   S3C2410_GPF0_EINT0,    KEY_POWER,	      "Power" },
+	{  IRQ_EINT6,  S3C2410_GPF6,   S3C2410_GPF6_EINT6,    KEY_ENTER, 	     "Select" },
+	{  IRQ_EINT7,  S3C2410_GPF7,   S3C2410_GPF7_EINT7,   KEY_RECORD,	     "Record" },
+	{  IRQ_EINT8,  S3C2410_GPG0,   S3C2410_GPG0_EINT8, KEY_CALENDAR,	   "Calendar" },
+	{ IRQ_EINT10,  S3C2410_GPG2,  S3C2410_GPG2_EINT10,   KEY_COFFEE,	   "Contacts" }, /* TODO: find a better key :P */
+	{ IRQ_EINT11,  S3C2410_GPG3,  S3C2410_GPG3_EINT11,     KEY_MAIL,	       "Mail" },
+	{ IRQ_EINT14,  S3C2410_GPG6,  S3C2410_GPG6_EINT14,     KEY_LEFT,	 "Left_arrow" },
+	{ IRQ_EINT15,  S3C2410_GPG7,  S3C2410_GPG7_EINT15, KEY_HOMEPAGE,	       "Home" },
+	{ IRQ_EINT16,  S3C2410_GPG8,  S3C2410_GPG8_EINT16,    KEY_RIGHT,	"Right_arrow" },
+	{ IRQ_EINT17,  S3C2410_GPG9,  S3C2410_GPG9_EINT17,       KEY_UP,	   "Up_arrow" },
+	{ IRQ_EINT18, S3C2410_GPG10, S3C2410_GPG10_EINT18,     KEY_DOWN,	 "Down_arrow" },
+};
+
+struct s3c2410kbd {
+	struct input_dev	dev;
+	spinlock_t		lock;
+	int 			count;
+	int			shift;	
+	char			phys[32];
+};
+
+static struct s3c2410kbd kbd;
+
+static irqreturn_t s3c2410kbd_keyevent(int irq, void *dev_id, struct pt_regs *regs)
+{
+	struct s3c2410kbd_button *button = (struct s3c2410kbd_button *)dev_id;
+	int down;
+
+	if (!button)
+		return IRQ_HANDLED;
+
+	down = !(s3c2410_gpio_getpin(button->pin));
+	
+	printk(KERN_DEBUG "%s button %s\n",button->name, down ? "pressed" : "released");
+
+	input_report_key(&kbd.dev, button->keycode, down);
+	input_sync(&kbd.dev);
+	
+	return IRQ_HANDLED;
+}
+
+static int __init s3c2410kbd_probe(struct device *dev)
+{
+	int i;
+
+	/* Initialise input stuff */
+	memset(&kbd, 0, sizeof(struct s3c2410kbd));
+	init_input_dev(&kbd.dev);
+	kbd.dev.evbit[0] = BIT(EV_KEY);
+	sprintf(kbd.phys, "input/s3c2410_kbd0");
+
+	kbd.dev.private = &kbd;
+	kbd.dev.name = DRV_NAME;
+	kbd.dev.phys = kbd.phys;
+	kbd.dev.id.bustype = BUS_HOST;
+	kbd.dev.id.vendor = 0xDEAD;
+	kbd.dev.id.product = 0xBEEF;
+	kbd.dev.id.version = S3C2410KBDVERSION;
+
+
+	for (i = 0; i < ARRAY_SIZE (s3c2410kbd_buttons); i++) {
+		set_bit(s3c2410kbd_buttons[i].keycode, kbd.dev.keybit);
+		s3c2410_gpio_cfgpin(s3c2410kbd_buttons[i].pin,s3c2410kbd_buttons[i].pin_setting);
+		request_irq (s3c2410kbd_buttons[i].irq, s3c2410kbd_keyevent,\
+				SA_SAMPLE_RANDOM, s3c2410kbd_buttons[i].name, &s3c2410kbd_buttons[i]);
+		set_irq_type(s3c2410kbd_buttons[i].irq, IRQT_BOTHEDGE);
+	}
+	
+	printk(KERN_INFO "%s successfully loaded\n", DRV_NAME);
+
+	/* All went ok, so register to the input system */
+	input_register_device(&kbd.dev);
+
+	return 0;
+}
+
+static int s3c2410kbd_remove(struct device *dev)
+{
+	int i;
+
+	for (i = 0; i < ARRAY_SIZE (s3c2410kbd_buttons); i++) {
+		disable_irq(s3c2410kbd_buttons[i].irq);
+		free_irq(s3c2410kbd_buttons[i].irq,&kbd.dev);
+	}
+
+	input_unregister_device(&kbd.dev);
+
+	return 0;
+}
+
+
+static struct device_driver s3c2410kbd_driver = {
+       .name           = DRV_NAME,
+       .bus            = &platform_bus_type,
+       .probe          = s3c2410kbd_probe,
+       .remove         = s3c2410kbd_remove,
+};
+
+
+int __init s3c2410kbd_init(void)
+{
+	return driver_register(&s3c2410kbd_driver);
+}
+
+void __exit s3c2410kbd_exit(void)
+{
+	driver_unregister(&s3c2410kbd_driver);
+}
+
+module_init(s3c2410kbd_init);
+module_exit(s3c2410kbd_exit);
+
+
+
+
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -36,6 +36,24 @@ config TOUCHSCREEN_CORGI
 	  To compile this driver as a module, choose M here: the
 	  module will be called ads7846_ts.
 
+config TOUCHSCREEN_S3C2410
+	tristate "Samsung S3C2410 touchscreen input driver"
+	depends on ARCH_S3C2410 && INPUT && INPUT_TOUCHSCREEN
+	select SERIO
+	help
+	  Say Y here if you have the s3c2410 touchscreen.
+
+	  If unsure, say N.
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called s3c2410_ts.
+
+config TOUCHSCREEN_S3C2410_DEBUG
+	boolean "Samsung S3C2410 touchscreen debug messages"
+	depends on TOUCHSCREEN_S3C2410
+	help
+	  Select this if you want debug messages
+
 config TOUCHSCREEN_GUNZE
 	tristate "Gunze AHL-51S touchscreen"
 	select SERIO
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -11,3 +11,5 @@ obj-$(CONFIG_TOUCHSCREEN_ELO)	+= elo.o
 obj-$(CONFIG_TOUCHSCREEN_MTOUCH) += mtouch.o
 obj-$(CONFIG_TOUCHSCREEN_MK712)	+= mk712.o
 obj-$(CONFIG_TOUCHSCREEN_HP600)	+= hp680_ts_input.o
+obj-$(CONFIG_TOUCHSCREEN_S3C2410) += s3c2410_ts.o
+
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c
new file mode 100644
--- /dev/null
+++ b/drivers/input/touchscreen/s3c2410_ts.c
@@ -0,0 +1,346 @@
+/*
+ * 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Copyright (c) 2004 Arnaud Patard <[e-mail]>
+ * iPAQ H1940 touchscreen support
+ *
+ * ChangeLog
+ *
+ * 2004-09-05: Herbert P枚tzl <[e-mail]>
+ *	- added clock (de-)allocation code
+ *
+ * 2005-03-06: Arnaud Patard <[e-mail]>
+ *      - h1940_ -> s3c2410 (this driver is now also used on the n30
+ *        machines :P)
+ *      - Debug messages are now enabled with the config option
+ *        TOUCHSCREEN_S3C2410_DEBUG
+ *      - Changed the way the value are read
+ *      - Input subsystem should now work
+ *      - Use ioremap and readl/writel
+ *
+ * 2005-03-23: Arnaud Patard <[e-mail]>
+ *      - Make use of some undocumented features of the touchscreen
+ *        controller
+ *
+ */
+
+#include <linux/config.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/init.h>
+#include <linux/serio.h>
+#include <linux/delay.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+
+#include <asm/arch/regs-adc.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/s3c2410_ts.h>
+#include <asm/hardware/clock.h>
+
+/* For ts.dev.id.version */
+#define S3C2410TSVERSION	0x0101
+
+#define WAIT4INT(x)  (((x)<<8) | \
+		     S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
+		     S3C2410_ADCTSC_XY_PST(3))
+
+#define AUTOPST	     (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | S3C2410_ADCTSC_XP_SEN | \
+		     S3C2410_ADCTSC_AUTO_PST | S3C2410_ADCTSC_XY_PST(0))
+
+#define DEBUG_LVL    KERN_DEBUG
+
+MODULE_AUTHOR("Arnaud Patard <[e-mail]>");
+MODULE_DESCRIPTION("s3c2410 touchscreen driver");
+MODULE_LICENSE("GPL");
+
+/*
+ * Definitions & global arrays.
+ */
+
+
+static char *s3c2410ts_name = "s3c2410 TouchScreen";
+
+/*
+ * Per-touchscreen data.
+ */
+
+struct s3c2410ts {
+	struct input_dev dev;
+	long xp;
+	long yp;
+	int count;
+	int shift;
+	char phys[32];
+};
+
+static struct s3c2410ts ts;
+static void __iomem *base_addr;
+
+static inline void s3c2410_ts_connect(void)
+{
+	s3c2410_gpio_cfgpin(S3C2410_GPG12, S3C2410_GPG12_XMON);
+	s3c2410_gpio_cfgpin(S3C2410_GPG13, S3C2410_GPG13_nXPON);
+	s3c2410_gpio_cfgpin(S3C2410_GPG14, S3C2410_GPG14_YMON);
+	s3c2410_gpio_cfgpin(S3C2410_GPG15, S3C2410_GPG15_nYPON);
+}
+
+static void touch_timer_fire(unsigned long data)
+{
+  	unsigned long data0;
+  	unsigned long data1;
+	int updown;
+
+  	data0 = readl(base_addr+S3C2410_ADCDAT0);
+  	data1 = readl(base_addr+S3C2410_ADCDAT1);
+
+ 	updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
+
+ 	if (updown) {
+ 		if (ts.count != 0) {
+ 			ts.xp >>= ts.shift;
+ 			ts.yp >>= ts.shift;
+
+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
+ 			{
+ 				struct timeval tv;
+ 				do_gettimeofday(&tv);
+ 				printk(DEBUG_LVL "T: %06d, X: %03ld, Y: %03ld\n", (int)tv.tv_usec, ts.xp, ts.yp);
+ 			}
+#endif
+
+ 			input_report_abs(&ts.dev, ABS_X, ts.xp);
+ 			input_report_abs(&ts.dev, ABS_Y, ts.yp);
+
+ 			input_report_key(&ts.dev, BTN_TOUCH, 1);
+ 			input_report_abs(&ts.dev, ABS_PRESSURE, 1);
+ 			input_sync(&ts.dev);
+ 		}
+
+ 		ts.xp = 0;
+ 		ts.yp = 0;
+ 		ts.count = 0;
+
+ 		writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
+ 		writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
+ 	} else {
+ 		ts.count = 0;
+
+ 		input_report_key(&ts.dev, BTN_TOUCH, 0);
+ 		input_report_abs(&ts.dev, ABS_PRESSURE, 0);
+ 		input_sync(&ts.dev);
+
+ 		writel(WAIT4INT(0), base_addr+S3C2410_ADCTSC);
+ 	}
+}
+
+static struct timer_list touch_timer =
+		TIMER_INITIALIZER(touch_timer_fire, 0, 0);
+
+static irqreturn_t stylus_updown(int irq, void *dev_id, struct pt_regs *regs)
+{
+	unsigned long data0;
+	unsigned long data1;
+	int updown;
+
+	data0 = readl(base_addr+S3C2410_ADCDAT0);
+	data1 = readl(base_addr+S3C2410_ADCDAT1);
+
+	updown = (!(data0 & S3C2410_ADCDAT0_UPDOWN)) && (!(data1 & S3C2410_ADCDAT0_UPDOWN));
+
+	/* TODO we should never get an interrupt with updown set while
+	 * the timer is running, but maybe we ought to verify that the
+	 * timer isn't running anyways. */
+
+	if (updown)
+		touch_timer_fire(0);
+
+	return IRQ_HANDLED;
+}
+
+
+static irqreturn_t stylus_action(int irq, void *dev_id, struct pt_regs *regs)
+{
+	unsigned long data0;
+	unsigned long data1;
+
+	data0 = readl(base_addr+S3C2410_ADCDAT0);
+	data1 = readl(base_addr+S3C2410_ADCDAT1);
+
+	ts.xp += data0 & S3C2410_ADCDAT0_XPDATA_MASK;
+	ts.yp += data1 & S3C2410_ADCDAT1_YPDATA_MASK;
+	ts.count++;
+
+        if (ts.count < (1<<ts.shift)) {
+		writel(S3C2410_ADCTSC_PULL_UP_DISABLE | AUTOPST, base_addr+S3C2410_ADCTSC);
+		writel(readl(base_addr+S3C2410_ADCCON) | S3C2410_ADCCON_ENABLE_START, base_addr+S3C2410_ADCCON);
+	} else {
+		mod_timer(&touch_timer, jiffies+1);
+		writel(WAIT4INT(1), base_addr+S3C2410_ADCTSC);
+	}
+
+	return IRQ_HANDLED;
+}
+
+static struct clk	*adc_clock;
+
+/*
+ * The functions for inserting/removing us as a module.
+ */
+
+static int __init s3c2410ts_probe(struct device *dev)
+{
+	struct s3c2410_ts_mach_info *info;
+
+	info = ( struct s3c2410_ts_mach_info *)dev->platform_data;
+
+	if (!info)
+	{
+		printk(KERN_ERR "Hm... too bad : no platform data for ts\n");
+		return -EINVAL;
+	}
+
+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
+	printk(DEBUG_LVL "Entering s3c2410ts_init\n");
+#endif
+
+	adc_clock = clk_get(NULL, "adc");
+	if (!adc_clock) {
+		printk(KERN_ERR "failed to get adc clock source\n");
+		return -ENOENT;
+	}
+	clk_use(adc_clock);
+	clk_enable(adc_clock);
+
+#ifdef CONFIG_TOUCHSCREEN_S3C2410_DEBUG
+	printk(DEBUG_LVL "got and enabled clock\n");
+#endif
+
+	base_addr=ioremap(S3C2410_PA_ADC,0x20);
+	if (base_addr == NULL) {
+		printk(KERN_ERR "Failed to remap register block\n");
+		return -ENOMEM;
+	}
+
+
+	/* Configure GPIOs */
+	s3c2410_ts_connect();
+
+	if ((info->presc&0xff) > 0)
+		writel(S3C2410_ADCCON_PRSCEN | S3C2410_ADCCON_PRSCVL(info->presc&0xFF),\
+			     base_addr+S3C2410_ADCCON);
+	else
+		writel(0,base_addr+S3C2410_ADCCON);
+
+
+	/* Initialise registers */