Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (29 commits)
  Input: i8042 - add Dell Vostro 1510 to nomux list
  Input: gtco - use USB endpoint API
  Input: add support for Maple controller as a joystick
  Input: atkbd - broaden the Dell DMI signatures
  Input: HIL drivers - add MODULE_ALIAS()
  Input: map_to_7segment.h - convert to __inline__ for userspace
  Input: add support for enhanced rotary controller on pxa930 and pxa935
  Input: add support for trackball on pxa930 and pxa935
  Input: add da9034 touchscreen support
  Input: ads7846 - strict_strtoul takes unsigned long
  Input: make some variables and functions static
  Input: add tsc2007 based touchscreen driver
  Input: psmouse - add module parameters to control OLPC touchpad delays
  Input: i8042 - add Gigabyte M912 netbook to noloop exception table
  Input: atkbd - Samsung NC10 key repeat fix
  Input: atkbd - add keyboard quirk for HP Pavilion ZV6100 laptop
  Input: libps2 - handle 0xfc responses from devices
  Input: add support for Wacom W8001 penabled serial touchscreen
  Input: synaptics - report multi-taps only if supported by the device
  Input: add joystick driver for Walkera WK-0701 RC transmitter
  ...

4 files changed, 511 insertions, 0 deletions

diff --git a/drivers/input/joystick/Kconfig b/drivers/input/joystick/Kconfig
index be5c14a5a0a4..b11419590cfe 100644
--- a/drivers/input/joystick/Kconfig
+++ b/drivers/input/joystick/Kconfig
@@ -294,4 +294,28 @@ config JOYSTICK_XPAD_LEDS
           This option enables support for the LED which surrounds the Big X on
           XBox 360 controller.
 
+config JOYSTICK_WALKERA0701
+        tristate "Walkera WK-0701 RC transmitter"
+        depends on HIGH_RES_TIMERS && PARPORT
+        help
+          Say Y or M here if you have a Walkera WK-0701 transmitter which is
+          supplied with a ready to fly Walkera helicopters such as HM36,
+          HM37, HM60 and want to use it via parport as a joystick. More
+          information is available: <file:Documentation/input/walkera0701.txt>
+
+          To compile this driver as a module, choose M here: the
+          module will be called walkera0701.
+
+config JOYSTICK_MAPLE
+        tristate "Dreamcast control pad"
+        depends on MAPLE
+        help
+          Say Y here if you have a SEGA Dreamcast and want to use your
+          controller as a joystick.
+
+          Most Dreamcast users will say Y.
+
+          To compile this as a module choose M here: the module will be called
+          maplecontrol.
+
 endif
diff --git a/drivers/input/joystick/Makefile b/drivers/input/joystick/Makefile
index fdbf8c4c2876..f3a8cbe2abb6 100644
--- a/drivers/input/joystick/Makefile
+++ b/drivers/input/joystick/Makefile
@@ -19,6 +19,7 @@ obj-$(CONFIG_JOYSTICK_IFORCE)		+= iforce/
 obj-$(CONFIG_JOYSTICK_INTERACT)         += interact.o
 obj-$(CONFIG_JOYSTICK_JOYDUMP)          += joydump.o
 obj-$(CONFIG_JOYSTICK_MAGELLAN)         += magellan.o
+obj-$(CONFIG_JOYSTICK_MAPLE)            += maplecontrol.o
 obj-$(CONFIG_JOYSTICK_SIDEWINDER)       += sidewinder.o
 obj-$(CONFIG_JOYSTICK_SPACEBALL)        += spaceball.o
 obj-$(CONFIG_JOYSTICK_SPACEORB)         += spaceorb.o
@@ -29,4 +30,5 @@ obj-$(CONFIG_JOYSTICK_TWIDJOY)		+= twidjoy.o
 obj-$(CONFIG_JOYSTICK_WARRIOR)          += warrior.o
 obj-$(CONFIG_JOYSTICK_XPAD)             += xpad.o
 obj-$(CONFIG_JOYSTICK_ZHENHUA)          += zhenhua.o
+obj-$(CONFIG_JOYSTICK_WALKERA0701)      += walkera0701.o
 
diff --git a/drivers/input/joystick/maplecontrol.c b/drivers/input/joystick/maplecontrol.c
new file mode 100644
index 000000000000..e50047bfe938
--- /dev/null
+++ b/drivers/input/joystick/maplecontrol.c
@@ -0,0 +1,193 @@
+/*
+ *      SEGA Dreamcast controller driver
+ *      Based on drivers/usb/iforce.c
+ *
+ *      Copyright Yaegashi Takeshi, 2001
+ *      Adrian McMenamin, 2008
+ */
+
+#include <linux/kernel.h>
+#include <linux/slab.h>
+#include <linux/input.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/timer.h>
+#include <linux/maple.h>
+
+MODULE_AUTHOR("Adrian McMenamin <adrian@mcmen.demon.co.uk>");
+MODULE_DESCRIPTION("SEGA Dreamcast controller driver");
+MODULE_LICENSE("GPL");
+
+struct dc_pad {
+        struct input_dev *dev;
+        struct maple_device *mdev;
+};
+
+static void dc_pad_callback(struct mapleq *mq)
+{
+        unsigned short buttons;
+        struct maple_device *mapledev = mq->dev;
+        struct dc_pad *pad = maple_get_drvdata(mapledev);
+        struct input_dev *dev = pad->dev;
+        unsigned char *res = mq->recvbuf;
+
+        buttons = ~le16_to_cpup((__le16 *)(res + 8));
+
+        input_report_abs(dev, ABS_HAT0Y,
+                (buttons & 0x0010 ? -1 : 0) + (buttons & 0x0020 ? 1 : 0));
+        input_report_abs(dev, ABS_HAT0X,
+                (buttons & 0x0040 ? -1 : 0) + (buttons & 0x0080 ? 1 : 0));
+        input_report_abs(dev, ABS_HAT1Y,
+                (buttons & 0x1000 ? -1 : 0) + (buttons & 0x2000 ? 1 : 0));
+        input_report_abs(dev, ABS_HAT1X,
+                (buttons & 0x4000 ? -1 : 0) + (buttons & 0x8000 ? 1 : 0));
+
+        input_report_key(dev, BTN_C,      buttons & 0x0001);
+        input_report_key(dev, BTN_B,      buttons & 0x0002);
+        input_report_key(dev, BTN_A,      buttons & 0x0004);
+        input_report_key(dev, BTN_START,  buttons & 0x0008);
+        input_report_key(dev, BTN_Z,      buttons & 0x0100);
+        input_report_key(dev, BTN_Y,      buttons & 0x0200);
+        input_report_key(dev, BTN_X,      buttons & 0x0400);
+        input_report_key(dev, BTN_SELECT, buttons & 0x0800);
+
+        input_report_abs(dev, ABS_GAS,    res[10]);
+        input_report_abs(dev, ABS_BRAKE,  res[11]);
+        input_report_abs(dev, ABS_X,      res[12]);
+        input_report_abs(dev, ABS_Y,      res[13]);
+        input_report_abs(dev, ABS_RX,     res[14]);
+        input_report_abs(dev, ABS_RY,     res[15]);
+}
+
+static int dc_pad_open(struct input_dev *dev)
+{
+        struct dc_pad *pad = dev->dev.platform_data;
+
+        maple_getcond_callback(pad->mdev, dc_pad_callback, HZ/20,
+                MAPLE_FUNC_CONTROLLER);
+
+        return 0;
+}
+
+static void dc_pad_close(struct input_dev *dev)
+{
+        struct dc_pad *pad = dev->dev.platform_data;
+
+        maple_getcond_callback(pad->mdev, dc_pad_callback, 0,
+                MAPLE_FUNC_CONTROLLER);
+}
+
+/* allow the controller to be used */
+static int __devinit probe_maple_controller(struct device *dev)
+{
+        static const short btn_bit[32] = {
+                BTN_C, BTN_B, BTN_A, BTN_START, -1, -1, -1, -1,
+                BTN_Z, BTN_Y, BTN_X, BTN_SELECT, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1,
+        };
+
+        static const short abs_bit[32] = {
+                -1, -1, -1, -1, ABS_HAT0Y, ABS_HAT0Y, ABS_HAT0X, ABS_HAT0X,
+                -1, -1, -1, -1, ABS_HAT1Y, ABS_HAT1Y, ABS_HAT1X, ABS_HAT1X,
+                ABS_GAS, ABS_BRAKE, ABS_X, ABS_Y, ABS_RX, ABS_RY, -1, -1,
+                -1, -1, -1, -1, -1, -1, -1, -1,
+        };
+
+        struct maple_device *mdev = to_maple_dev(dev);
+        struct maple_driver *mdrv = to_maple_driver(dev->driver);
+        int i, error;
+        struct dc_pad *pad;
+        struct input_dev *idev;
+        unsigned long data = be32_to_cpu(mdev->devinfo.function_data[0]);
+
+        pad = kzalloc(sizeof(struct dc_pad), GFP_KERNEL);
+        idev = input_allocate_device();
+        if (!pad || !idev) {
+                error = -ENOMEM;
+                goto fail;
+        }
+
+        pad->dev = idev;
+        pad->mdev = mdev;
+
+        idev->open = dc_pad_open;
+        idev->close = dc_pad_close;
+
+        for (i = 0; i < 32; i++) {
+                if (data & (1 << i)) {
+                        if (btn_bit[i] >= 0)
+                                __set_bit(btn_bit[i], idev->keybit);
+                        else if (abs_bit[i] >= 0)
+                                __set_bit(abs_bit[i], idev->absbit);
+                }
+        }
+
+        if (idev->keybit[BIT_WORD(BTN_JOYSTICK)])
+                idev->evbit[0] |= BIT_MASK(EV_KEY);
+
+        if (idev->absbit[0])
+                idev->evbit[0] |= BIT_MASK(EV_ABS);
+
+        for (i = ABS_X; i <= ABS_BRAKE; i++)
+                input_set_abs_params(idev, i, 0, 255, 0, 0);
+
+        for (i = ABS_HAT0X; i <= ABS_HAT3Y; i++)
+                input_set_abs_params(idev, i, 1, -1, 0, 0);
+
+        idev->dev.platform_data = pad;
+        idev->dev.parent = &mdev->dev;
+        idev->name = mdev->product_name;
+        idev->id.bustype = BUS_HOST;
+        input_set_drvdata(idev, pad);
+
+        error = input_register_device(idev);
+        if (error)
+                goto fail;
+
+        mdev->driver = mdrv;
+        maple_set_drvdata(mdev, pad);
+
+        return 0;
+
+fail:
+        input_free_device(idev);
+        kfree(pad);
+        maple_set_drvdata(mdev, NULL);
+        return error;
+}
+
+static int __devexit remove_maple_controller(struct device *dev)
+{
+        struct maple_device *mdev = to_maple_dev(dev);
+        struct dc_pad *pad = maple_get_drvdata(mdev);
+
+        mdev->callback = NULL;
+        input_unregister_device(pad->dev);
+        maple_set_drvdata(mdev, NULL);
+        kfree(pad);
+
+        return 0;
+}
+
+static struct maple_driver dc_pad_driver = {
+        .function =     MAPLE_FUNC_CONTROLLER,
+        .drv = {
+                .name   = "Dreamcast_controller",
+                .probe  = probe_maple_controller,
+                .remove = __devexit_p(remove_maple_controller),
+        },
+};
+
+static int __init dc_pad_init(void)
+{
+        return maple_driver_register(&dc_pad_driver);
+}
+
+static void __exit dc_pad_exit(void)
+{
+        maple_driver_unregister(&dc_pad_driver);
+}
+
+module_init(dc_pad_init);
+module_exit(dc_pad_exit);
diff --git a/drivers/input/joystick/walkera0701.c b/drivers/input/joystick/walkera0701.c
new file mode 100644
index 000000000000..4dfa1eed4b7c
--- /dev/null
+++ b/drivers/input/joystick/walkera0701.c
@@ -0,0 +1,292 @@
+/*
+ *  Parallel port to Walkera WK-0701 TX joystick
+ *
+ *  Copyright (c) 2008 Peter Popovec
+ *
+ *  More about driver:  <file:Documentation/input/walkera0701.txt>
+ */
+
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+*/
+
+/* #define WK0701_DEBUG */
+
+#define RESERVE 20000
+#define SYNC_PULSE 1306000
+#define BIN0_PULSE 288000
+#define BIN1_PULSE 438000
+
+#define ANALOG_MIN_PULSE 318000
+#define ANALOG_MAX_PULSE 878000
+#define ANALOG_DELTA 80000
+
+#define BIN_SAMPLE ((BIN0_PULSE + BIN1_PULSE) / 2)
+
+#define NO_SYNC 25
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/parport.h>
+#include <linux/input.h>
+#include <linux/hrtimer.h>
+
+MODULE_AUTHOR("Peter Popovec <popovec@fei.tuke.sk>");
+MODULE_DESCRIPTION("Walkera WK-0701 TX as joystick");
+MODULE_LICENSE("GPL");
+
+static unsigned int walkera0701_pp_no;
+module_param_named(port, walkera0701_pp_no, int, 0);
+MODULE_PARM_DESC(port,
+                 "Parallel port adapter for Walkera WK-0701 TX (default is 0)");
+
+/*
+ * For now, only one device is supported, if somebody need more devices, code
+ * can be expanded, one struct walkera_dev per device must be allocated and
+ * set up by walkera0701_connect (release of device by walkera0701_disconnect)
+ */
+
+struct walkera_dev {
+        unsigned char buf[25];
+        u64 irq_time, irq_lasttime;
+        int counter;
+        int ack;
+
+        struct input_dev *input_dev;
+        struct hrtimer timer;
+
+        struct parport *parport;
+        struct pardevice *pardevice;
+};
+
+static struct walkera_dev w_dev;
+
+static inline void walkera0701_parse_frame(struct walkera_dev *w)
+{
+        int i;
+        int val1, val2, val3, val4, val5, val6, val7, val8;
+        int crc1, crc2;
+
+        for (crc1 = crc2 = i = 0; i < 10; i++) {
+                crc1 += w->buf[i] & 7;
+                crc2 += (w->buf[i] & 8) >> 3;
+        }
+        if ((w->buf[10] & 7) != (crc1 & 7))
+                return;
+        if (((w->buf[10] & 8) >> 3) != (((crc1 >> 3) + crc2) & 1))
+                return;
+        for (crc1 = crc2 = 0, i = 11; i < 23; i++) {
+                crc1 += w->buf[i] & 7;
+                crc2 += (w->buf[i] & 8) >> 3;
+        }
+        if ((w->buf[23] & 7) != (crc1 & 7))
+                return;
+        if (((w->buf[23] & 8) >> 3) != (((crc1 >> 3) + crc2) & 1))
+                return;
+        val1 = ((w->buf[0] & 7) * 256 + w->buf[1] * 16 + w->buf[2]) >> 2;
+        val1 *= ((w->buf[0] >> 2) & 2) - 1;     /* sign */
+        val2 = (w->buf[2] & 1) << 8 | (w->buf[3] << 4) | w->buf[4];
+        val2 *= (w->buf[2] & 2) - 1;    /* sign */
+        val3 = ((w->buf[5] & 7) * 256 + w->buf[6] * 16 + w->buf[7]) >> 2;
+        val3 *= ((w->buf[5] >> 2) & 2) - 1;     /* sign */
+        val4 = (w->buf[7] & 1) << 8 | (w->buf[8] << 4) | w->buf[9];
+        val4 *= (w->buf[7] & 2) - 1;    /* sign */
+        val5 = ((w->buf[11] & 7) * 256 + w->buf[12] * 16 + w->buf[13]) >> 2;
+        val5 *= ((w->buf[11] >> 2) & 2) - 1;    /* sign */
+        val6 = (w->buf[13] & 1) << 8 | (w->buf[14] << 4) | w->buf[15];
+        val6 *= (w->buf[13] & 2) - 1;   /* sign */
+        val7 = ((w->buf[16] & 7) * 256 + w->buf[17] * 16 + w->buf[18]) >> 2;
+        val7 *= ((w->buf[16] >> 2) & 2) - 1;    /*sign */
+        val8 = (w->buf[18] & 1) << 8 | (w->buf[19] << 4) | w->buf[20];
+        val8 *= (w->buf[18] & 2) - 1;   /*sign */
+
+#ifdef WK0701_DEBUG
+        {
+                int magic, magic_bit;
+                magic = (w->buf[21] << 4) | w->buf[22];
+                magic_bit = (w->buf[24] & 8) >> 3;
+                printk(KERN_DEBUG
+                       "walkera0701: %4d %4d %4d %4d  %4d %4d %4d %4d (magic %2x %d)\n",
+                       val1, val2, val3, val4, val5, val6, val7, val8, magic,
+                       magic_bit);
+        }
+#endif
+        input_report_abs(w->input_dev, ABS_X, val2);
+        input_report_abs(w->input_dev, ABS_Y, val1);
+        input_report_abs(w->input_dev, ABS_Z, val6);
+        input_report_abs(w->input_dev, ABS_THROTTLE, val3);
+        input_report_abs(w->input_dev, ABS_RUDDER, val4);
+        input_report_abs(w->input_dev, ABS_MISC, val7);
+        input_report_key(w->input_dev, BTN_GEAR_DOWN, val5 > 0);
+}
+
+static inline int read_ack(struct pardevice *p)
+{
+        return parport_read_status(p->port) & 0x40;
+}
+
+/* falling edge, prepare to BIN value calculation */
+static void walkera0701_irq_handler(void *handler_data)
+{
+        u64 pulse_time;
+        struct walkera_dev *w = handler_data;
+
+        w->irq_time = ktime_to_ns(ktime_get());
+        pulse_time = w->irq_time - w->irq_lasttime;
+        w->irq_lasttime = w->irq_time;
+
+        /* cancel timer, if in handler or active do resync */
+        if (unlikely(0 != hrtimer_try_to_cancel(&w->timer))) {
+                w->counter = NO_SYNC;
+                return;
+        }
+
+        if (w->counter < NO_SYNC) {
+                if (w->ack) {
+                        pulse_time -= BIN1_PULSE;
+                        w->buf[w->counter] = 8;
+                } else {
+                        pulse_time -= BIN0_PULSE;
+                        w->buf[w->counter] = 0;
+                }
+                if (w->counter == 24) { /* full frame */
+                        walkera0701_parse_frame(w);
+                        w->counter = NO_SYNC;
+                        if (abs(pulse_time - SYNC_PULSE) < RESERVE)     /* new frame sync */
+                                w->counter = 0;
+                } else {
+                        if ((pulse_time > (ANALOG_MIN_PULSE - RESERVE)
+                             && (pulse_time < (ANALOG_MAX_PULSE + RESERVE)))) {
+                                pulse_time -= (ANALOG_MIN_PULSE - RESERVE);
+                                pulse_time = (u32) pulse_time / ANALOG_DELTA;   /* overtiping is safe, pulsetime < s32.. */
+                                w->buf[w->counter++] |= (pulse_time & 7);
+                        } else
+                                w->counter = NO_SYNC;
+                }
+        } else if (abs(pulse_time - SYNC_PULSE - BIN0_PULSE) <
+                                RESERVE + BIN1_PULSE - BIN0_PULSE)      /* frame sync .. */
+                w->counter = 0;
+
+        hrtimer_start(&w->timer, ktime_set(0, BIN_SAMPLE), HRTIMER_MODE_REL);
+}
+
+static enum hrtimer_restart timer_handler(struct hrtimer
+                                          *handle)
+{
+        struct walkera_dev *w;
+
+        w = container_of(handle, struct walkera_dev, timer);
+        w->ack = read_ack(w->pardevice);
+
+        return HRTIMER_NORESTART;
+}
+
+static int walkera0701_open(struct input_dev *dev)
+{
+        struct walkera_dev *w = input_get_drvdata(dev);
+
+        parport_enable_irq(w->parport);
+        return 0;
+}
+
+static void walkera0701_close(struct input_dev *dev)
+{
+        struct walkera_dev *w = input_get_drvdata(dev);
+
+        parport_disable_irq(w->parport);
+}
+
+static int walkera0701_connect(struct walkera_dev *w, int parport)
+{
+        int err = -ENODEV;
+
+        w->parport = parport_find_number(parport);
+        if (w->parport == NULL)
+                return -ENODEV;
+
+        if (w->parport->irq == -1) {
+                printk(KERN_ERR "walkera0701: parport without interrupt\n");
+                goto init_err;
+        }
+
+        err = -EBUSY;
+        w->pardevice = parport_register_device(w->parport, "walkera0701",
+                                    NULL, NULL, walkera0701_irq_handler,
+                                    PARPORT_DEV_EXCL, w);
+        if (!w->pardevice)
+                goto init_err;
+
+        if (parport_negotiate(w->pardevice->port, IEEE1284_MODE_COMPAT))
+                goto init_err1;
+
+        if (parport_claim(w->pardevice))
+                goto init_err1;
+
+        w->input_dev = input_allocate_device();
+        if (!w->input_dev)
+                goto init_err2;
+
+        input_set_drvdata(w->input_dev, w);
+        w->input_dev->name = "Walkera WK-0701 TX";
+        w->input_dev->phys = w->parport->name;
+        w->input_dev->id.bustype = BUS_PARPORT;
+
+        /* TODO what id vendor/product/version ? */
+        w->input_dev->id.vendor = 0x0001;
+        w->input_dev->id.product = 0x0001;
+        w->input_dev->id.version = 0x0100;
+        w->input_dev->open = walkera0701_open;
+        w->input_dev->close = walkera0701_close;
+
+        w->input_dev->evbit[0] = BIT(EV_ABS) | BIT_MASK(EV_KEY);
+        w->input_dev->keybit[BIT_WORD(BTN_GEAR_DOWN)] = BIT_MASK(BTN_GEAR_DOWN);
+
+        input_set_abs_params(w->input_dev, ABS_X, -512, 512, 0, 0);
+        input_set_abs_params(w->input_dev, ABS_Y, -512, 512, 0, 0);
+        input_set_abs_params(w->input_dev, ABS_Z, -512, 512, 0, 0);
+        input_set_abs_params(w->input_dev, ABS_THROTTLE, -512, 512, 0, 0);
+        input_set_abs_params(w->input_dev, ABS_RUDDER, -512, 512, 0, 0);
+        input_set_abs_params(w->input_dev, ABS_MISC, -512, 512, 0, 0);
+
+        err = input_register_device(w->input_dev);
+        if (err)
+                goto init_err3;
+
+        hrtimer_init(&w->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
+        w->timer.function = timer_handler;
+        return 0;
+
+ init_err3:
+        input_free_device(w->input_dev);
+ init_err2:
+        parport_release(w->pardevice);
+ init_err1:
+        parport_unregister_device(w->pardevice);
+ init_err:
+        parport_put_port(w->parport);
+        return err;
+}
+
+static void walkera0701_disconnect(struct walkera_dev *w)
+{
+        hrtimer_cancel(&w->timer);
+        input_unregister_device(w->input_dev);
+        parport_release(w->pardevice);
+        parport_unregister_device(w->pardevice);
+        parport_put_port(w->parport);
+}
+
+static int __init walkera0701_init(void)
+{
+        return walkera0701_connect(&w_dev, walkera0701_pp_no);
+}
+
+static void __exit walkera0701_exit(void)
+{
+        walkera0701_disconnect(&w_dev);
+}
+
+module_init(walkera0701_init);
+module_exit(walkera0701_exit);