Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and
build failures in vio.c after merge.

Conflicts:
	drivers/i2c/busses/i2c-cpm.c
	drivers/i2c/busses/i2c-mpc.c
	drivers/net/gianfar.c

Also fixed up one line in arch/powerpc/kernel/vio.c to use the
correct node pointer.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

4 files changed, 208 insertions, 0 deletions

diff --git a/drivers/input/serio/Kconfig b/drivers/input/serio/Kconfig
index 7e319d65ec57..f34f1dbeb577 100644
--- a/drivers/input/serio/Kconfig
+++ b/drivers/input/serio/Kconfig
@@ -209,4 +209,20 @@ config SERIO_ALTERA_PS2
           To compile this driver as a module, choose M here: the
           module will be called altera_ps2.
 
+config SERIO_AMS_DELTA
+        tristate "Amstrad Delta (E3) mailboard support"
+        depends on MACH_AMS_DELTA
+        default y
+        select AMS_DELTA_FIQ
+        ---help---
+          Say Y here if you have an E3 and want to use its mailboard,
+          or any standard AT keyboard connected to the mailboard port.
+
+          When used for the E3 mailboard, a non-standard key table
+          must be loaded from userspace, possibly using udev extras
+          provided keymap helper utility.
+
+          To compile this driver as a module, choose M here;
+          the module will be called ams_delta_serio.
+
 endif
diff --git a/drivers/input/serio/Makefile b/drivers/input/serio/Makefile
index bf945f789d05..84c80bf7185e 100644
--- a/drivers/input/serio/Makefile
+++ b/drivers/input/serio/Makefile
@@ -21,5 +21,6 @@ obj-$(CONFIG_SERIO_PCIPS2)	+= pcips2.o
 obj-$(CONFIG_SERIO_MACEPS2)     += maceps2.o
 obj-$(CONFIG_SERIO_LIBPS2)      += libps2.o
 obj-$(CONFIG_SERIO_RAW)         += serio_raw.o
+obj-$(CONFIG_SERIO_AMS_DELTA)   += ams_delta_serio.o
 obj-$(CONFIG_SERIO_XILINX_XPS_PS2)      += xilinx_ps2.o
 obj-$(CONFIG_SERIO_ALTERA_PS2)  += altera_ps2.o
diff --git a/drivers/input/serio/ams_delta_serio.c b/drivers/input/serio/ams_delta_serio.c
new file mode 100644
index 000000000000..8f1770e1e08b
--- /dev/null
+++ b/drivers/input/serio/ams_delta_serio.c
@@ -0,0 +1,177 @@
+/*
+ *  Amstrad E3 (Delta) keyboard port driver
+ *
+ *  Copyright (c) 2006 Matt Callow
+ *  Copyright (c) 2010 Janusz Krzysztofik
+ *
+ * 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.
+ *
+ * Thanks to Cliff Lawson for his help
+ *
+ * The Amstrad Delta keyboard (aka mailboard) uses normal PC-AT style serial
+ * transmission.  The keyboard port is formed of two GPIO lines, for clock
+ * and data.  Due to strict timing requirements of the interface,
+ * the serial data stream is read and processed by a FIQ handler.
+ * The resulting words are fetched by this driver from a circular buffer.
+ *
+ * Standard AT keyboard driver (atkbd) is used for handling the keyboard data.
+ * However, when used with the E3 mailboard that producecs non-standard
+ * scancodes, a custom key table must be prepared and loaded from userspace.
+ */
+#include <linux/gpio.h>
+#include <linux/irq.h>
+#include <linux/serio.h>
+#include <linux/slab.h>
+
+#include <asm/mach-types.h>
+#include <plat/board-ams-delta.h>
+
+#include <mach/ams-delta-fiq.h>
+
+MODULE_AUTHOR("Matt Callow");
+MODULE_DESCRIPTION("AMS Delta (E3) keyboard port driver");
+MODULE_LICENSE("GPL");
+
+static struct serio *ams_delta_serio;
+
+static int check_data(int data)
+{
+        int i, parity = 0;
+
+        /* check valid stop bit */
+        if (!(data & 0x400)) {
+                dev_warn(&ams_delta_serio->dev,
+                                "invalid stop bit, data=0x%X\n",
+                                data);
+                return SERIO_FRAME;
+        }
+        /* calculate the parity */
+        for (i = 1; i < 10; i++) {
+                if (data & (1 << i))
+                        parity++;
+        }
+        /* it should be odd */
+        if (!(parity & 0x01)) {
+                dev_warn(&ams_delta_serio->dev,
+                                "paritiy check failed, data=0x%X parity=0x%X\n",
+                                data, parity);
+                return SERIO_PARITY;
+        }
+        return 0;
+}
+
+static irqreturn_t ams_delta_serio_interrupt(int irq, void *dev_id)
+{
+        int *circ_buff = &fiq_buffer[FIQ_CIRC_BUFF];
+        int data, dfl;
+        u8 scancode;
+
+        fiq_buffer[FIQ_IRQ_PEND] = 0;
+
+        /*
+         * Read data from the circular buffer, check it
+         * and then pass it on the serio
+         */
+        while (fiq_buffer[FIQ_KEYS_CNT] > 0) {
+
+                data = circ_buff[fiq_buffer[FIQ_HEAD_OFFSET]++];
+                fiq_buffer[FIQ_KEYS_CNT]--;
+                if (fiq_buffer[FIQ_HEAD_OFFSET] == fiq_buffer[FIQ_BUF_LEN])
+                        fiq_buffer[FIQ_HEAD_OFFSET] = 0;
+
+                dfl = check_data(data);
+                scancode = (u8) (data >> 1) & 0xFF;
+                serio_interrupt(ams_delta_serio, scancode, dfl);
+        }
+        return IRQ_HANDLED;
+}
+
+static int ams_delta_serio_open(struct serio *serio)
+{
+        /* enable keyboard */
+        ams_delta_latch2_write(AMD_DELTA_LATCH2_KEYBRD_PWR,
+                        AMD_DELTA_LATCH2_KEYBRD_PWR);
+
+        return 0;
+}
+
+static void ams_delta_serio_close(struct serio *serio)
+{
+        /* disable keyboard */
+        ams_delta_latch2_write(AMD_DELTA_LATCH2_KEYBRD_PWR, 0);
+}
+
+static int __init ams_delta_serio_init(void)
+{
+        int err;
+
+        if (!machine_is_ams_delta())
+                return -ENODEV;
+
+        ams_delta_serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
+        if (!ams_delta_serio)
+                return -ENOMEM;
+
+        ams_delta_serio->id.type = SERIO_8042;
+        ams_delta_serio->open = ams_delta_serio_open;
+        ams_delta_serio->close = ams_delta_serio_close;
+        strlcpy(ams_delta_serio->name, "AMS DELTA keyboard adapter",
+                        sizeof(ams_delta_serio->name));
+        strlcpy(ams_delta_serio->phys, "GPIO/serio0",
+                        sizeof(ams_delta_serio->phys));
+
+        err = gpio_request(AMS_DELTA_GPIO_PIN_KEYBRD_DATA, "serio-data");
+        if (err) {
+                pr_err("ams_delta_serio: Couldn't request gpio pin for data\n");
+                goto serio;
+        }
+        gpio_direction_input(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
+
+        err = gpio_request(AMS_DELTA_GPIO_PIN_KEYBRD_CLK, "serio-clock");
+        if (err) {
+                pr_err("ams_delta_serio: couldn't request gpio pin for clock\n");
+                goto gpio_data;
+        }
+        gpio_direction_input(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
+
+        err = request_irq(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK),
+                        ams_delta_serio_interrupt, IRQ_TYPE_EDGE_RISING,
+                        "ams-delta-serio", 0);
+        if (err < 0) {
+                pr_err("ams_delta_serio: couldn't request gpio interrupt %d\n",
+                                gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK));
+                goto gpio_clk;
+        }
+        /*
+         * Since GPIO register handling for keyboard clock pin is performed
+         * at FIQ level, switch back from edge to simple interrupt handler
+         * to avoid bad interaction.
+         */
+        set_irq_handler(gpio_to_irq(AMS_DELTA_GPIO_PIN_KEYBRD_CLK),
+                        handle_simple_irq);
+
+        serio_register_port(ams_delta_serio);
+        dev_info(&ams_delta_serio->dev, "%s\n", ams_delta_serio->name);
+
+        return 0;
+gpio_clk:
+        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
+gpio_data:
+        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
+serio:
+        kfree(ams_delta_serio);
+        return err;
+}
+module_init(ams_delta_serio_init);
+
+static void __exit ams_delta_serio_exit(void)
+{
+        serio_unregister_port(ams_delta_serio);
+        free_irq(OMAP_GPIO_IRQ(AMS_DELTA_GPIO_PIN_KEYBRD_CLK), 0);
+        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_CLK);
+        gpio_free(AMS_DELTA_GPIO_PIN_KEYBRD_DATA);
+        kfree(ams_delta_serio);
+}
+module_exit(ams_delta_serio_exit);
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
index ead0494721d0..6168469ad1a6 100644
--- a/drivers/input/serio/i8042-x86ia64io.h
+++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -660,8 +660,21 @@ static int i8042_pnp_aux_probe(struct pnp_dev *dev, const struct pnp_device_id *
 }
 
 static struct pnp_device_id pnp_kbd_devids[] = {
+        { .id = "PNP0300", .driver_data = 0 },
+        { .id = "PNP0301", .driver_data = 0 },
+        { .id = "PNP0302", .driver_data = 0 },
         { .id = "PNP0303", .driver_data = 0 },
+        { .id = "PNP0304", .driver_data = 0 },
+        { .id = "PNP0305", .driver_data = 0 },
+        { .id = "PNP0306", .driver_data = 0 },
+        { .id = "PNP0309", .driver_data = 0 },
+        { .id = "PNP030a", .driver_data = 0 },
         { .id = "PNP030b", .driver_data = 0 },
+        { .id = "PNP0320", .driver_data = 0 },
+        { .id = "PNP0343", .driver_data = 0 },
+        { .id = "PNP0344", .driver_data = 0 },
+        { .id = "PNP0345", .driver_data = 0 },
+        { .id = "CPQA0D7", .driver_data = 0 },
         { .id = "", },
 };
 
@@ -672,6 +685,7 @@ static struct pnp_driver i8042_pnp_kbd_driver = {
 };
 
 static struct pnp_device_id pnp_aux_devids[] = {
+        { .id = "AUI0200", .driver_data = 0 },
         { .id = "FJC6000", .driver_data = 0 },
         { .id = "FJC6001", .driver_data = 0 },
         { .id = "PNP0f03", .driver_data = 0 },