fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / input / serio / i8042.c
index 36e5011..3b12996 100644 (file)
 #include <linux/moduleparam.h>
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
-#include <linux/config.h>
 #include <linux/init.h>
 #include <linux/serio.h>
 #include <linux/err.h>
+#include <linux/rcupdate.h>
+#include <linux/platform_device.h>
 
 #include <asm/io.h>
 
@@ -26,6 +27,10 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@suse.cz>");
 MODULE_DESCRIPTION("i8042 keyboard and mouse controller driver");
 MODULE_LICENSE("GPL");
 
+static unsigned int i8042_nokbd;
+module_param_named(nokbd, i8042_nokbd, bool, 0);
+MODULE_PARM_DESC(nokbd, "Do not probe or use KBD port.");
+
 static unsigned int i8042_noaux;
 module_param_named(noaux, i8042_noaux, bool, 0);
 MODULE_PARM_DESC(noaux, "Do not probe or use AUX (mouse) port.");
@@ -52,12 +57,16 @@ MODULE_PARM_DESC(dumbkbd, "Pretend that controller can only read data from keybo
 
 static unsigned int i8042_noloop;
 module_param_named(noloop, i8042_noloop, bool, 0);
-MODULE_PARM_DESC(dumbkbd, "Disable the AUX Loopback command while probing for the AUX port");
+MODULE_PARM_DESC(noloop, "Disable the AUX Loopback command while probing for the AUX port");
+
+static unsigned int i8042_blink_frequency = 500;
+module_param_named(panicblink, i8042_blink_frequency, uint, 0600);
+MODULE_PARM_DESC(panicblink, "Frequency with which keyboard LEDs should blink when kernel panics");
 
-#ifdef CONFIG_ACPI
-static int i8042_noacpi;
-module_param_named(noacpi, i8042_noacpi, bool, 0);
-MODULE_PARM_DESC(noacpi, "Do not use ACPI to detect controller settings");
+#ifdef CONFIG_PNP
+static int i8042_nopnp;
+module_param_named(nopnp, i8042_nopnp, bool, 0);
+MODULE_PARM_DESC(nopnp, "Do not use PNP to detect controller settings");
 #endif
 
 #define DEBUG
@@ -76,50 +85,31 @@ __obsolete_setup("i8042_dumbkbd");
 
 #include "i8042.h"
 
-DEFINE_SPINLOCK(i8042_lock);
+static DEFINE_SPINLOCK(i8042_lock);
 
-struct i8042_values {
+struct i8042_port {
+       struct serio *serio;
        int irq;
-       unsigned char disable;
-       unsigned char irqen;
        unsigned char exists;
        signed char mux;
-       char name[8];
 };
 
-static struct i8042_values i8042_kbd_values = {
-       .disable        = I8042_CTR_KBDDIS,
-       .irqen          = I8042_CTR_KBDINT,
-       .mux            = -1,
-       .name           = "KBD",
-};
+#define I8042_KBD_PORT_NO      0
+#define I8042_AUX_PORT_NO      1
+#define I8042_MUX_PORT_NO      2
+#define I8042_NUM_PORTS                (I8042_NUM_MUX_PORTS + 2)
 
-static struct i8042_values i8042_aux_values = {
-       .disable        = I8042_CTR_AUXDIS,
-       .irqen          = I8042_CTR_AUXINT,
-       .mux            = -1,
-       .name           = "AUX",
-};
-
-static struct i8042_values i8042_mux_values[I8042_NUM_MUX_PORTS];
+static struct i8042_port i8042_ports[I8042_NUM_PORTS];
 
-static struct serio *i8042_kbd_port;
-static struct serio *i8042_aux_port;
-static struct serio *i8042_mux_port[I8042_NUM_MUX_PORTS];
 static unsigned char i8042_initial_ctr;
 static unsigned char i8042_ctr;
-static unsigned char i8042_mux_open;
 static unsigned char i8042_mux_present;
-static struct timer_list i8042_timer;
+static unsigned char i8042_kbd_irq_registered;
+static unsigned char i8042_aux_irq_registered;
+static unsigned char i8042_suppress_kbd_ack;
 static struct platform_device *i8042_platform_device;
 
-/*
- * Shared IRQ's require a device pointer, but this driver doesn't support
- * multiple devices
- */
-#define i8042_request_irq_cookie (&i8042_timer)
-
-static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs);
+static irqreturn_t i8042_interrupt(int irq, void *dev_id);
 
 /*
  * The i8042_wait_read() and i8042_wait_write functions wait for the i8042 to
@@ -130,6 +120,7 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs);
 static int i8042_wait_read(void)
 {
        int i = 0;
+
        while ((~i8042_read_status() & I8042_STR_OBF) && (i < I8042_CTL_TIMEOUT)) {
                udelay(50);
                i++;
@@ -140,6 +131,7 @@ static int i8042_wait_read(void)
 static int i8042_wait_write(void)
 {
        int i = 0;
+
        while ((i8042_read_status() & I8042_STR_IBF) && (i < I8042_CTL_TIMEOUT)) {
                udelay(50);
                i++;
@@ -155,16 +147,17 @@ static int i8042_wait_write(void)
 static int i8042_flush(void)
 {
        unsigned long flags;
-       unsigned char data;
+       unsigned char data, str;
        int i = 0;
 
        spin_lock_irqsave(&i8042_lock, flags);
 
-       while ((i8042_read_status() & I8042_STR_OBF) && (i++ < I8042_BUFFER_SIZE)) {
+       while (((str = i8042_read_status()) & I8042_STR_OBF) && (i < I8042_BUFFER_SIZE)) {
                udelay(50);
                data = i8042_read_data();
+               i++;
                dbg("%02x <- i8042 (flush, %s)", data,
-                       i8042_read_status() & I8042_STR_AUXDATA ? "aux" : "kbd");
+                       str & I8042_STR_AUXDATA ? "aux" : "kbd");
        }
 
        spin_unlock_irqrestore(&i8042_lock, flags);
@@ -180,43 +173,56 @@ static int i8042_flush(void)
  * encoded in bits 8-11 of the command number.
  */
 
-static int i8042_command(unsigned char *param, int command)
+static int __i8042_command(unsigned char *param, int command)
 {
-       unsigned long flags;
-       int retval = 0, i = 0;
+       int i, error;
 
        if (i8042_noloop && command == I8042_CMD_AUX_LOOP)
                return -1;
 
-       spin_lock_irqsave(&i8042_lock, flags);
+       error = i8042_wait_write();
+       if (error)
+               return error;
+
+       dbg("%02x -> i8042 (command)", command & 0xff);
+       i8042_write_command(command & 0xff);
 
-       retval = i8042_wait_write();
-       if (!retval) {
-               dbg("%02x -> i8042 (command)", command & 0xff);
-               i8042_write_command(command & 0xff);
+       for (i = 0; i < ((command >> 12) & 0xf); i++) {
+               error = i8042_wait_write();
+               if (error)
+                       return error;
+               dbg("%02x -> i8042 (parameter)", param[i]);
+               i8042_write_data(param[i]);
        }
 
-       if (!retval)
-               for (i = 0; i < ((command >> 12) & 0xf); i++) {
-                       if ((retval = i8042_wait_write())) break;
-                       dbg("%02x -> i8042 (parameter)", param[i]);
-                       i8042_write_data(param[i]);
+       for (i = 0; i < ((command >> 8) & 0xf); i++) {
+               error = i8042_wait_read();
+               if (error) {
+                       dbg("     -- i8042 (timeout)");
+                       return error;
                }
 
-       if (!retval)
-               for (i = 0; i < ((command >> 8) & 0xf); i++) {
-                       if ((retval = i8042_wait_read())) break;
-                       if (i8042_read_status() & I8042_STR_AUXDATA)
-                               param[i] = ~i8042_read_data();
-                       else
-                               param[i] = i8042_read_data();
-                       dbg("%02x <- i8042 (return)", param[i]);
+               if (command == I8042_CMD_AUX_LOOP &&
+                   !(i8042_read_status() & I8042_STR_AUXDATA)) {
+                       dbg("     -- i8042 (auxerr)");
+                       return -1;
                }
 
-       spin_unlock_irqrestore(&i8042_lock, flags);
+               param[i] = i8042_read_data();
+               dbg("%02x <- i8042 (return)", param[i]);
+       }
 
-       if (retval)
-               dbg("     -- i8042 (timeout)");
+       return 0;
+}
+
+static int i8042_command(unsigned char *param, int command)
+{
+       unsigned long flags;
+       int retval;
+
+       spin_lock_irqsave(&i8042_lock, flags);
+       retval = __i8042_command(param, command);
+       spin_unlock_irqrestore(&i8042_lock, flags);
 
        return retval;
 }
@@ -232,7 +238,7 @@ static int i8042_kbd_write(struct serio *port, unsigned char c)
 
        spin_lock_irqsave(&i8042_lock, flags);
 
-       if(!(retval = i8042_wait_write())) {
+       if (!(retval = i8042_wait_write())) {
                dbg("%02x -> i8042 (kbd-data)", c);
                i8042_write_data(c);
        }
@@ -246,119 +252,41 @@ static int i8042_kbd_write(struct serio *port, unsigned char c)
  * i8042_aux_write() sends a byte out through the aux interface.
  */
 
-static int i8042_aux_write(struct serio *port, unsigned char c)
+static int i8042_aux_write(struct serio *serio, unsigned char c)
 {
-       struct i8042_values *values = port->port_data;
-       int retval;
-
-/*
- * Send the byte out.
- */
-
-       if (values->mux == -1)
-               retval = i8042_command(&c, I8042_CMD_AUX_SEND);
-       else
-               retval = i8042_command(&c, I8042_CMD_MUX_SEND + values->mux);
-
-/*
- * Make sure the interrupt happens and the character is received even
- * in the case the IRQ isn't wired, so that we can receive further
- * characters later.
- */
+       struct i8042_port *port = serio->port_data;
 
-       i8042_interrupt(0, NULL, NULL);
-       return retval;
+       return i8042_command(&c, port->mux == -1 ?
+                                       I8042_CMD_AUX_SEND :
+                                       I8042_CMD_MUX_SEND + port->mux);
 }
 
 /*
- * i8042_activate_port() enables port on a chip.
+ * i8042_start() is called by serio core when port is about to finish
+ * registering. It will mark port as existing so i8042_interrupt can
+ * start sending data through it.
  */
-
-static int i8042_activate_port(struct serio *port)
+static int i8042_start(struct serio *serio)
 {
-       struct i8042_values *values = port->port_data;
-
-       i8042_flush();
-
-       /*
-        * Enable port again here because it is disabled if we are
-        * resuming (normally it is enabled already).
-        */
-       i8042_ctr &= ~values->disable;
-
-       i8042_ctr |= values->irqen;
-
-       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
-               i8042_ctr &= ~values->irqen;
-               return -1;
-       }
+       struct i8042_port *port = serio->port_data;
 
+       port->exists = 1;
+       mb();
        return 0;
 }
 
-
 /*
- * i8042_open() is called when a port is open by the higher layer.
- * It allocates the interrupt and calls i8042_enable_port.
+ * i8042_stop() marks serio port as non-existing so i8042_interrupt
+ * will not try to send data to the port that is about to go away.
+ * The function is called by serio core as part of unregister procedure.
  */
-
-static int i8042_open(struct serio *port)
+static void i8042_stop(struct serio *serio)
 {
-       struct i8042_values *values = port->port_data;
-
-       if (values->mux != -1)
-               if (i8042_mux_open++)
-                       return 0;
-
-       if (request_irq(values->irq, i8042_interrupt,
-                       SA_SHIRQ, "i8042", i8042_request_irq_cookie)) {
-               printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", values->irq, values->name);
-               goto irq_fail;
-       }
-
-       if (i8042_activate_port(port)) {
-               printk(KERN_ERR "i8042.c: Can't activate %s, unregistering the port\n", values->name);
-               goto activate_fail;
-       }
+       struct i8042_port *port = serio->port_data;
 
-       i8042_interrupt(0, NULL, NULL);
-
-       return 0;
-
-activate_fail:
-       free_irq(values->irq, i8042_request_irq_cookie);
-
-irq_fail:
-       values->exists = 0;
-       serio_unregister_port_delayed(port);
-
-       return -1;
-}
-
-/*
- * i8042_close() frees the interrupt, so that it can possibly be used
- * by another driver. We never know - if the user doesn't have a mouse,
- * the BIOS could have used the AUX interrupt for PCI.
- */
-
-static void i8042_close(struct serio *port)
-{
-       struct i8042_values *values = port->port_data;
-
-       if (values->mux != -1)
-               if (--i8042_mux_open)
-                       return;
-
-       i8042_ctr &= ~values->irqen;
-
-       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
-               printk(KERN_ERR "i8042.c: Can't write CTR while closing %s.\n", values->name);
-               return;
-       }
-
-       free_irq(values->irq, i8042_request_irq_cookie);
-
-       i8042_flush();
+       port->exists = 0;
+       synchronize_sched();
+       port->serio = NULL;
 }
 
 /*
@@ -367,27 +295,25 @@ static void i8042_close(struct serio *port)
  * to the upper layers.
  */
 
-static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t i8042_interrupt(int irq, void *dev_id)
 {
+       struct i8042_port *port;
        unsigned long flags;
-       unsigned char str, data = 0;
+       unsigned char str, data;
        unsigned int dfl;
-       unsigned int aux_idx;
-       int ret;
-
-       mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD);
+       unsigned int port_no;
+       int ret = 1;
 
        spin_lock_irqsave(&i8042_lock, flags);
        str = i8042_read_status();
-       if (str & I8042_STR_OBF)
-               data = i8042_read_data();
-       spin_unlock_irqrestore(&i8042_lock, flags);
-
-       if (~str & I8042_STR_OBF) {
+       if (unlikely(~str & I8042_STR_OBF)) {
+               spin_unlock_irqrestore(&i8042_lock, flags);
                if (irq) dbg("Interrupt %d, without any data", irq);
                ret = 0;
                goto out;
        }
+       data = i8042_read_data();
+       spin_unlock_irqrestore(&i8042_lock, flags);
 
        if (i8042_mux_present && (str & I8042_STR_AUXDATA)) {
                static unsigned long last_transmit;
@@ -396,187 +322,230 @@ static irqreturn_t i8042_interrupt(int irq, void *dev_id, struct pt_regs *regs)
                dfl = 0;
                if (str & I8042_STR_MUXERR) {
                        dbg("MUX error, status is %02x, data is %02x", str, data);
-                       switch (data) {
-                               default:
 /*
  * When MUXERR condition is signalled the data register can only contain
  * 0xfd, 0xfe or 0xff if implementation follows the spec. Unfortunately
- * it is not always the case. Some KBC just get confused which port the
- * data came from and signal error leaving the data intact. They _do not_
- * revert to legacy mode (actually I've never seen KBC reverting to legacy
- * mode yet, when we see one we'll add proper handling).
- * Anyway, we will assume that the data came from the same serio last byte
+ * it is not always the case. Some KBCs also report 0xfc when there is
+ * nothing connected to the port while others sometimes get confused which
+ * port the data came from and signal error leaving the data intact. They
+ * _do not_ revert to legacy mode (actually I've never seen KBC reverting
+ * to legacy mode yet, when we see one we'll add proper handling).
+ * Anyway, we process 0xfc, 0xfd, 0xfe and 0xff as timeouts, and for the
+ * rest assume that the data came from the same serio last byte
  * was transmitted (if transmission happened not too long ago).
  */
+
+                       switch (data) {
+                               default:
                                        if (time_before(jiffies, last_transmit + HZ/10)) {
                                                str = last_str;
                                                break;
                                        }
                                        /* fall through - report timeout */
+                               case 0xfc:
                                case 0xfd:
                                case 0xfe: dfl = SERIO_TIMEOUT; data = 0xfe; break;
                                case 0xff: dfl = SERIO_PARITY;  data = 0xfe; break;
                        }
                }
 
-               aux_idx = (str >> 6) & 3;
-
-               dbg("%02x <- i8042 (interrupt, aux%d, %d%s%s)",
-                       data, aux_idx, irq,
-                       dfl & SERIO_PARITY ? ", bad parity" : "",
-                       dfl & SERIO_TIMEOUT ? ", timeout" : "");
-
-               if (likely(i8042_mux_values[aux_idx].exists))
-                       serio_interrupt(i8042_mux_port[aux_idx], data, dfl, regs);
-
+               port_no = I8042_MUX_PORT_NO + ((str >> 6) & 3);
                last_str = str;
                last_transmit = jiffies;
-               goto irq_ret;
+       } else {
+
+               dfl = ((str & I8042_STR_PARITY) ? SERIO_PARITY : 0) |
+                     ((str & I8042_STR_TIMEOUT) ? SERIO_TIMEOUT : 0);
+
+               port_no = (str & I8042_STR_AUXDATA) ?
+                               I8042_AUX_PORT_NO : I8042_KBD_PORT_NO;
        }
 
-       dfl = ((str & I8042_STR_PARITY) ? SERIO_PARITY : 0) |
-             ((str & I8042_STR_TIMEOUT) ? SERIO_TIMEOUT : 0);
+       port = &i8042_ports[port_no];
 
-       dbg("%02x <- i8042 (interrupt, %s, %d%s%s)",
-               data, (str & I8042_STR_AUXDATA) ? "aux" : "kbd", irq,
-               dfl & SERIO_PARITY ? ", bad parity" : "",
-               dfl & SERIO_TIMEOUT ? ", timeout" : "");
+       dbg("%02x <- i8042 (interrupt, %d, %d%s%s)",
+           data, port_no, irq,
+           dfl & SERIO_PARITY ? ", bad parity" : "",
+           dfl & SERIO_TIMEOUT ? ", timeout" : "");
 
+       if (unlikely(i8042_suppress_kbd_ack))
+               if (port_no == I8042_KBD_PORT_NO &&
+                   (data == 0xfa || data == 0xfe)) {
+                       i8042_suppress_kbd_ack--;
+                       goto out;
+               }
 
-       if (str & I8042_STR_AUXDATA) {
-               if (likely(i8042_aux_values.exists))
-                       serio_interrupt(i8042_aux_port, data, dfl, regs);
-       } else {
-               if (likely(i8042_kbd_values.exists))
-                       serio_interrupt(i8042_kbd_port, data, dfl, regs);
-       }
+       if (likely(port->exists))
+               serio_interrupt(port->serio, data, dfl);
 
-irq_ret:
-       ret = 1;
-out:
+ out:
        return IRQ_RETVAL(ret);
 }
 
 /*
- * i8042_set_mux_mode checks whether the controller has an active
- * multiplexor and puts the chip into Multiplexed (1) or Legacy (0) mode.
+ * i8042_enable_kbd_port enables keybaord port on chip
  */
 
-static int i8042_set_mux_mode(unsigned int mode, unsigned char *mux_version)
+static int i8042_enable_kbd_port(void)
 {
+       i8042_ctr &= ~I8042_CTR_KBDDIS;
+       i8042_ctr |= I8042_CTR_KBDINT;
 
-       unsigned char param;
-/*
- * Get rid of bytes in the queue.
- */
+       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+               printk(KERN_ERR "i8042.c: Failed to enable KBD port.\n");
+               return -EIO;
+       }
 
-       i8042_flush();
+       return 0;
+}
 
 /*
- * Internal loopback test - send three bytes, they should come back from the
- * mouse interface, the last should be version. Note that we negate mouseport
- * command responses for the i8042_check_aux() routine.
+ * i8042_enable_aux_port enables AUX (mouse) port on chip
  */
 
-       param = 0xf0;
-       if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0x0f)
-               return -1;
-       param = mode ? 0x56 : 0xf6;
-       if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != (mode ? 0xa9 : 0x09))
-               return -1;
-       param = mode ? 0xa4 : 0xa5;
-       if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == (mode ? 0x5b : 0x5a))
-               return -1;
+static int i8042_enable_aux_port(void)
+{
+       i8042_ctr &= ~I8042_CTR_AUXDIS;
+       i8042_ctr |= I8042_CTR_AUXINT;
 
-       if (mux_version)
-               *mux_version = ~param;
+       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+               printk(KERN_ERR "i8042.c: Failed to enable AUX port.\n");
+               return -EIO;
+       }
 
        return 0;
 }
 
-
 /*
  * i8042_enable_mux_ports enables 4 individual AUX ports after
  * the controller has been switched into Multiplexed mode
  */
 
-static int i8042_enable_mux_ports(struct i8042_values *values)
+static int i8042_enable_mux_ports(void)
 {
        unsigned char param;
        int i;
+
+       for (i = 0; i < I8042_NUM_MUX_PORTS; i++) {
+               i8042_command(&param, I8042_CMD_MUX_PFX + i);
+               i8042_command(&param, I8042_CMD_AUX_ENABLE);
+       }
+
+       return i8042_enable_aux_port();
+}
+
 /*
- * Disable all muxed ports by disabling AUX.
+ * i8042_set_mux_mode checks whether the controller has an active
+ * multiplexor and puts the chip into Multiplexed (1) or Legacy (0) mode.
  */
 
-       i8042_ctr |= I8042_CTR_AUXDIS;
-       i8042_ctr &= ~I8042_CTR_AUXINT;
+static int i8042_set_mux_mode(unsigned int mode, unsigned char *mux_version)
+{
 
-       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
-               printk(KERN_ERR "i8042.c: Failed to disable AUX port, can't use MUX.\n");
-               return -1;
-       }
+       unsigned char param;
+/*
+ * Get rid of bytes in the queue.
+ */
+
+       i8042_flush();
 
 /*
- * Enable all muxed ports.
+ * Internal loopback test - send three bytes, they should come back from the
+ * mouse interface, the last should be version.
  */
 
-       for (i = 0; i < 4; i++) {
-               i8042_command(&param, I8042_CMD_MUX_PFX + i);
-               i8042_command(&param, I8042_CMD_AUX_ENABLE);
-       }
+       param = 0xf0;
+       if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xf0)
+               return -1;
+       param = mode ? 0x56 : 0xf6;
+       if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != (mode ? 0x56 : 0xf6))
+               return -1;
+       param = mode ? 0xa4 : 0xa5;
+       if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param == (mode ? 0xa4 : 0xa5))
+               return -1;
+
+       if (mux_version)
+               *mux_version = param;
 
        return 0;
 }
 
-
 /*
  * i8042_check_mux() checks whether the controller supports the PS/2 Active
  * Multiplexing specification by Synaptics, Phoenix, Insyde and
  * LCS/Telegraphics.
  */
 
-static int __init i8042_check_mux(struct i8042_values *values)
+static int __devinit i8042_check_mux(void)
 {
        unsigned char mux_version;
 
        if (i8042_set_mux_mode(1, &mux_version))
                return -1;
 
-       /* Workaround for interference with USB Legacy emulation */
-       /* that causes a v10.12 MUX to be found. */
+/*
+ * Workaround for interference with USB Legacy emulation
+ * that causes a v10.12 MUX to be found.
+ */
        if (mux_version == 0xAC)
                return -1;
 
        printk(KERN_INFO "i8042.c: Detected active multiplexing controller, rev %d.%d.\n",
                (mux_version >> 4) & 0xf, mux_version & 0xf);
 
-       if (i8042_enable_mux_ports(values))
-               return -1;
+/*
+ * Disable all muxed ports by disabling AUX.
+ */
+       i8042_ctr |= I8042_CTR_AUXDIS;
+       i8042_ctr &= ~I8042_CTR_AUXINT;
+
+       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+               printk(KERN_ERR "i8042.c: Failed to disable AUX port, can't use MUX.\n");
+               return -EIO;
+       }
 
        i8042_mux_present = 1;
+
        return 0;
 }
 
-
 /*
- * i8042_check_aux() applies as much paranoia as it can at detecting
- * the presence of an AUX interface.
+ * The following is used to test AUX IRQ delivery.
  */
+static struct completion i8042_aux_irq_delivered __devinitdata;
+static int i8042_irq_being_tested __devinitdata;
 
-static int __init i8042_check_aux(struct i8042_values *values)
+static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id)
 {
-       unsigned char param;
-       static int i8042_check_aux_cookie;
+       unsigned long flags;
+       unsigned char str, data;
+
+       spin_lock_irqsave(&i8042_lock, flags);
+       str = i8042_read_status();
+       if (str & I8042_STR_OBF) {
+               data = i8042_read_data();
+               if (i8042_irq_being_tested &&
+                   data == 0xa5 && (str & I8042_STR_AUXDATA))
+                       complete(&i8042_aux_irq_delivered);
+       }
+       spin_unlock_irqrestore(&i8042_lock, flags);
+
+       return IRQ_HANDLED;
+}
+
 
 /*
- * Check if AUX irq is available. If it isn't, then there is no point
- * in trying to detect AUX presence.
+ * i8042_check_aux() applies as much paranoia as it can at detecting
+ * the presence of an AUX interface.
  */
 
-       if (request_irq(values->irq, i8042_interrupt, SA_SHIRQ,
-                               "i8042", &i8042_check_aux_cookie))
-                return -1;
-       free_irq(values->irq, &i8042_check_aux_cookie);
+static int __devinit i8042_check_aux(void)
+{
+       int retval = -1;
+       int irq_registered = 0;
+       int aux_loop_broken = 0;
+       unsigned long flags;
+       unsigned char param;
 
 /*
  * Get rid of bytes in the queue.
@@ -591,7 +560,8 @@ static int __init i8042_check_aux(struct i8042_values *values)
  */
 
        param = 0x5a;
-       if (i8042_command(&param, I8042_CMD_AUX_LOOP) || param != 0xa5) {
+       retval = i8042_command(&param, I8042_CMD_AUX_LOOP);
+       if (retval || param != 0x5a) {
 
 /*
  * External connection test - filters out AT-soldered PS/2 i8042's
@@ -601,9 +571,16 @@ static int __init i8042_check_aux(struct i8042_values *values)
  * AUX ports, we test for this only when the LOOP command failed.
  */
 
-               if (i8042_command(&param, I8042_CMD_AUX_TEST)
-                       || (param && param != 0xfa && param != 0xff))
-                               return -1;
+               if (i8042_command(&param, I8042_CMD_AUX_TEST) ||
+                   (param && param != 0xfa && param != 0xff))
+                       return -1;
+
+/*
+ * If AUX_LOOP completed without error but returned unexpected data
+ * mark it as broken
+ */
+               if (!retval)
+                       aux_loop_broken = 1;
        }
 
 /*
@@ -623,55 +600,99 @@ static int __init i8042_check_aux(struct i8042_values *values)
                return -1;
 
 /*
- * Disable the interface.
+ * Test AUX IRQ delivery to make sure BIOS did not grab the IRQ and
+ * used it for a PCI card or somethig else.
  */
 
-       i8042_ctr |= I8042_CTR_AUXDIS;
-       i8042_ctr &= ~I8042_CTR_AUXINT;
+       if (i8042_noloop || aux_loop_broken) {
+/*
+ * Without LOOP command we can't test AUX IRQ delivery. Assume the port
+ * is working and hope we are right.
+ */
+               retval = 0;
+               goto out;
+       }
 
-       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
-               return -1;
+       if (request_irq(I8042_AUX_IRQ, i8042_aux_test_irq, IRQF_SHARED,
+                       "i8042", i8042_platform_device))
+               goto out;
 
-       return 0;
-}
+       irq_registered = 1;
 
+       if (i8042_enable_aux_port())
+               goto out;
+
+       spin_lock_irqsave(&i8042_lock, flags);
 
+       init_completion(&i8042_aux_irq_delivered);
+       i8042_irq_being_tested = 1;
+
+       param = 0xa5;
+       retval = __i8042_command(&param, I8042_CMD_AUX_LOOP & 0xf0ff);
+
+       spin_unlock_irqrestore(&i8042_lock, flags);
+
+       if (retval)
+               goto out;
+
+       if (wait_for_completion_timeout(&i8042_aux_irq_delivered,
+                                       msecs_to_jiffies(250)) == 0) {
 /*
- * i8042_port_register() marks the device as existing,
- * registers it, and reports to the user.
+ * AUX IRQ was never delivered so we need to flush the controller to
+ * get rid of the byte we put there; otherwise keyboard may not work.
  */
+               i8042_flush();
+               retval = -1;
+       }
 
-static int __init i8042_port_register(struct serio *port)
-{
-       struct i8042_values *values = port->port_data;
+ out:
 
-       values->exists = 1;
+/*
+ * Disable the interface.
+ */
 
-       i8042_ctr &= ~values->disable;
+       i8042_ctr |= I8042_CTR_AUXDIS;
+       i8042_ctr &= ~I8042_CTR_AUXINT;
 
-       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
-               printk(KERN_WARNING "i8042.c: Can't write CTR while registering.\n");
-               values->exists = 0;
-               return -1;
-       }
+       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
+               retval = -1;
 
-       printk(KERN_INFO "serio: i8042 %s port at %#lx,%#lx irq %d\n",
-              values->name,
-              (unsigned long) I8042_DATA_REG,
-              (unsigned long) I8042_COMMAND_REG,
-              values->irq);
+       if (irq_registered)
+               free_irq(I8042_AUX_IRQ, i8042_platform_device);
 
-       serio_register_port(port);
+       return retval;
+}
+
+static int i8042_controller_check(void)
+{
+       if (i8042_flush() == I8042_BUFFER_SIZE) {
+               printk(KERN_ERR "i8042.c: No controller found.\n");
+               return -ENODEV;
+       }
 
        return 0;
 }
 
-
-static void i8042_timer_func(unsigned long data)
+static int i8042_controller_selftest(void)
 {
-       i8042_interrupt(0, NULL, NULL);
-}
+       unsigned char param;
 
+       if (!i8042_reset)
+               return 0;
+
+       if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
+               printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
+               return -ENODEV;
+       }
+
+       if (param != I8042_RET_CTL_TEST) {
+               printk(KERN_ERR "i8042.c: i8042 controller selftest failed. (%#x != %#x)\n",
+                        param, I8042_RET_CTL_TEST);
+               return -EIO;
+       }
+
+       return 0;
+}
 
 /*
  * i8042_controller init initializes the i8042 controller, and,
@@ -683,36 +704,13 @@ static int i8042_controller_init(void)
 {
        unsigned long flags;
 
-/*
- * Test the i8042. We need to know if it thinks it's working correctly
- * before doing anything else.
- */
-
-       i8042_flush();
-
-       if (i8042_reset) {
-
-               unsigned char param;
-
-               if (i8042_command(&param, I8042_CMD_CTL_TEST)) {
-                       printk(KERN_ERR "i8042.c: i8042 controller self test timeout.\n");
-                       return -1;
-               }
-
-               if (param != I8042_RET_CTL_TEST) {
-                       printk(KERN_ERR "i8042.c: i8042 controller selftest failed. (%#x != %#x)\n",
-                                param, I8042_RET_CTL_TEST);
-                       return -1;
-               }
-       }
-
 /*
  * Save the CTR for restoral on unload / reboot.
  */
 
        if (i8042_command(&i8042_ctr, I8042_CMD_CTL_RCTR)) {
                printk(KERN_ERR "i8042.c: Can't read CTR while initializing i8042.\n");
-               return -1;
+               return -EIO;
        }
 
        i8042_initial_ctr = i8042_ctr;
@@ -761,7 +759,7 @@ static int i8042_controller_init(void)
 
        if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
                printk(KERN_ERR "i8042.c: Can't write CTR while initializing i8042.\n");
-               return -1;
+               return -EIO;
        }
 
        return 0;
@@ -769,34 +767,31 @@ static int i8042_controller_init(void)
 
 
 /*
- * Reset the controller.
+ * Reset the controller and reset CRT to the original value set by BIOS.
  */
-void i8042_controller_reset(void)
+
+static void i8042_controller_reset(void)
 {
-       unsigned char param;
+       i8042_flush();
 
 /*
- * Reset the controller if requested.
+ * Disable MUX mode if present.
  */
 
-       if (i8042_reset)
-               if (i8042_command(&param, I8042_CMD_CTL_TEST))
-                       printk(KERN_ERR "i8042.c: i8042 controller reset timeout.\n");
+       if (i8042_mux_present)
+               i8042_set_mux_mode(0, NULL);
 
 /*
- * Disable MUX mode if present.
+ * Reset the controller if requested.
  */
 
-       if (i8042_mux_present)
-               i8042_set_mux_mode(0, NULL);
+       i8042_controller_selftest();
 
 /*
  * Restore the original control register setting.
  */
 
-       i8042_ctr = i8042_initial_ctr;
-
-       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR))
+       if (i8042_command(&i8042_initial_ctr, I8042_CMD_CTL_WCTR))
                printk(KERN_WARNING "i8042.c: Can't restore CTR.\n");
 }
 
@@ -806,57 +801,60 @@ void i8042_controller_reset(void)
  * able to talk to the hardware when rebooting.
  */
 
-void i8042_controller_cleanup(void)
+static void i8042_controller_cleanup(void)
 {
        int i;
 
-       i8042_flush();
-
 /*
  * Reset anything that is connected to the ports.
  */
 
-       if (i8042_kbd_values.exists)
-               serio_cleanup(i8042_kbd_port);
-
-       if (i8042_aux_values.exists)
-               serio_cleanup(i8042_aux_port);
-
-       for (i = 0; i < I8042_NUM_MUX_PORTS; i++)
-               if (i8042_mux_values[i].exists)
-                       serio_cleanup(i8042_mux_port[i]);
+       for (i = 0; i < I8042_NUM_PORTS; i++)
+               if (i8042_ports[i].serio)
+                       serio_cleanup(i8042_ports[i].serio);
 
        i8042_controller_reset();
 }
 
 
-static int blink_frequency = 500;
-module_param_named(panicblink, blink_frequency, int, 0600);
+/*
+ * i8042_panic_blink() will flash the keyboard LEDs and is called when
+ * kernel panics. Flashing LEDs is useful for users running X who may
+ * not see the console and will help distingushing panics from "real"
+ * lockups.
+ *
+ * Note that DELAY has a limit of 10ms so we will not get stuck here
+ * waiting for KBC to free up even if KBD interrupt is off
+ */
 
-/* Catch the case when the kbd interrupt is off */
 #define DELAY do { mdelay(1); if (++delay > 10) return delay; } while(0)
 
-/* Tell the user who may be running in X and not see the console that we have
-   panic'ed. This is to distingush panics from "real" lockups.  */
 static long i8042_panic_blink(long count)
 {
        long delay = 0;
        static long last_blink;
        static char led;
-       /* Roughly 1/2s frequency. KDB uses about 1s. Make sure it is
-          different. */
-       if (!blink_frequency)
+
+       /*
+        * We expect frequency to be about 1/2s. KDB uses about 1s.
+        * Make sure they are different.
+        */
+       if (!i8042_blink_frequency)
                return 0;
-       if (count - last_blink < blink_frequency)
+       if (count - last_blink < i8042_blink_frequency)
                return 0;
+
        led ^= 0x01 | 0x04;
        while (i8042_read_status() & I8042_STR_IBF)
                DELAY;
+       dbg("%02x -> i8042 (panic blink)", 0xed);
+       i8042_suppress_kbd_ack = 2;
        i8042_write_data(0xed); /* set leds */
        DELAY;
        while (i8042_read_status() & I8042_STR_IBF)
                DELAY;
        DELAY;
+       dbg("%02x -> i8042 (panic blink)", led);
        i8042_write_data(led);
        DELAY;
        last_blink = count;
@@ -869,12 +867,9 @@ static long i8042_panic_blink(long count)
  * Here we try to restore the original BIOS settings
  */
 
-static int i8042_suspend(struct device *dev, u32 state, u32 level)
+static int i8042_suspend(struct platform_device *dev, pm_message_t state)
 {
-       if (level == SUSPEND_DISABLE) {
-               del_timer_sync(&i8042_timer);
-               i8042_controller_reset();
-       }
+       i8042_controller_cleanup();
 
        return 0;
 }
@@ -884,46 +879,43 @@ static int i8042_suspend(struct device *dev, u32 state, u32 level)
  * Here we try to reset everything back to a state in which suspended
  */
 
-static int i8042_resume(struct device *dev, u32 level)
+static int i8042_resume(struct platform_device *dev)
 {
-       int i;
-
-       if (level != RESUME_ENABLE)
-               return 0;
+       int error;
 
-       if (i8042_controller_init()) {
-               printk(KERN_ERR "i8042: resume failed\n");
-               return -1;
-       }
+       error = i8042_controller_check();
+       if (error)
+               return error;
 
-       if (i8042_mux_present)
-               if (i8042_set_mux_mode(1, NULL) ||
-                   i8042_enable_mux_ports(&i8042_aux_values)) {
-                       printk(KERN_WARNING "i8042: failed to resume active multiplexor, mouse won't work.\n");
-               }
+       error = i8042_controller_selftest();
+       if (error)
+               return error;
 
 /*
- * Reconnect anything that was connected to the ports.
+ * Restore pre-resume CTR value and disable all ports
  */
 
-       if (i8042_kbd_values.exists && i8042_activate_port(i8042_kbd_port) == 0)
-               serio_reconnect(i8042_kbd_port);
+       i8042_ctr |= I8042_CTR_AUXDIS | I8042_CTR_KBDDIS;
+       i8042_ctr &= ~(I8042_CTR_AUXINT | I8042_CTR_KBDINT);
+       if (i8042_command(&i8042_ctr, I8042_CMD_CTL_WCTR)) {
+               printk(KERN_ERR "i8042: Can't write CTR to resume\n");
+               return -EIO;
+       }
 
-       if (i8042_aux_values.exists && i8042_activate_port(i8042_aux_port) == 0)
-               serio_reconnect(i8042_aux_port);
+       if (i8042_mux_present) {
+               if (i8042_set_mux_mode(1, NULL) || i8042_enable_mux_ports())
+                       printk(KERN_WARNING
+                               "i8042: failed to resume active multiplexor, "
+                               "mouse won't work.\n");
+       } else if (i8042_ports[I8042_AUX_PORT_NO].serio)
+               i8042_enable_aux_port();
 
-       for (i = 0; i < I8042_NUM_MUX_PORTS; i++)
-               if (i8042_mux_values[i].exists && i8042_activate_port(i8042_mux_port[i]) == 0)
-                       serio_reconnect(i8042_mux_port[i]);
-/*
- * Restart timer (for polling "stuck" data)
- */
-       mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD);
+       if (i8042_ports[I8042_KBD_PORT_NO].serio)
+               i8042_enable_kbd_port();
 
-       panic_blink = i8042_panic_blink;
+       i8042_interrupt(0, NULL);
 
        return 0;
-
 }
 
 /*
@@ -931,157 +923,294 @@ static int i8042_resume(struct device *dev, u32 level)
  * because otherwise BIOSes will be confused.
  */
 
-static void i8042_shutdown(struct device *dev)
+static void i8042_shutdown(struct platform_device *dev)
 {
        i8042_controller_cleanup();
 }
 
-static struct device_driver i8042_driver = {
-       .name           = "i8042",
-       .bus            = &platform_bus_type,
-       .suspend        = i8042_suspend,
-       .resume         = i8042_resume,
-       .shutdown       = i8042_shutdown,
-};
-
-static struct serio * __init i8042_allocate_kbd_port(void)
+static int __devinit i8042_create_kbd_port(void)
 {
        struct serio *serio;
+       struct i8042_port *port = &i8042_ports[I8042_KBD_PORT_NO];
 
-       serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
-       if (serio) {
-               memset(serio, 0, sizeof(struct serio));
-               serio->type             = i8042_direct ? SERIO_8042 : SERIO_8042_XL,
-               serio->write            = i8042_dumbkbd ? NULL : i8042_kbd_write,
-               serio->open             = i8042_open,
-               serio->close            = i8042_close,
-               serio->port_data        = &i8042_kbd_values,
-               serio->dev.parent       = &i8042_platform_device->dev;
-               strlcpy(serio->name, "i8042 Kbd Port", sizeof(serio->name));
-               strlcpy(serio->phys, I8042_KBD_PHYS_DESC, sizeof(serio->phys));
-       }
+       serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
+       if (!serio)
+               return -ENOMEM;
+
+       serio->id.type          = i8042_direct ? SERIO_8042 : SERIO_8042_XL;
+       serio->write            = i8042_dumbkbd ? NULL : i8042_kbd_write;
+       serio->start            = i8042_start;
+       serio->stop             = i8042_stop;
+       serio->port_data        = port;
+       serio->dev.parent       = &i8042_platform_device->dev;
+       strlcpy(serio->name, "i8042 KBD port", sizeof(serio->name));
+       strlcpy(serio->phys, I8042_KBD_PHYS_DESC, sizeof(serio->phys));
+
+       port->serio = serio;
+       port->irq = I8042_KBD_IRQ;
 
-       return serio;
+       return 0;
 }
 
-static struct serio * __init i8042_allocate_aux_port(void)
+static int __devinit i8042_create_aux_port(int idx)
 {
        struct serio *serio;
-
-       serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
-       if (serio) {
-               memset(serio, 0, sizeof(struct serio));
-               serio->type             = SERIO_8042;
-               serio->write            = i8042_aux_write;
-               serio->open             = i8042_open;
-               serio->close            = i8042_close;
-               serio->port_data        = &i8042_aux_values,
-               serio->dev.parent       = &i8042_platform_device->dev;
-               strlcpy(serio->name, "i8042 Aux Port", sizeof(serio->name));
+       int port_no = idx < 0 ? I8042_AUX_PORT_NO : I8042_MUX_PORT_NO + idx;
+       struct i8042_port *port = &i8042_ports[port_no];
+
+       serio = kzalloc(sizeof(struct serio), GFP_KERNEL);
+       if (!serio)
+               return -ENOMEM;
+
+       serio->id.type          = SERIO_8042;
+       serio->write            = i8042_aux_write;
+       serio->start            = i8042_start;
+       serio->stop             = i8042_stop;
+       serio->port_data        = port;
+       serio->dev.parent       = &i8042_platform_device->dev;
+       if (idx < 0) {
+               strlcpy(serio->name, "i8042 AUX port", sizeof(serio->name));
                strlcpy(serio->phys, I8042_AUX_PHYS_DESC, sizeof(serio->phys));
+       } else {
+               snprintf(serio->name, sizeof(serio->name), "i8042 AUX%d port", idx);
+               snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, idx + 1);
        }
 
-       return serio;
+       port->serio = serio;
+       port->mux = idx;
+       port->irq = I8042_AUX_IRQ;
+
+       return 0;
 }
 
-static struct serio * __init i8042_allocate_mux_port(int index)
+static void __devinit i8042_free_kbd_port(void)
 {
-       struct serio *serio;
-       struct i8042_values *values = &i8042_mux_values[index];
-
-       serio = kmalloc(sizeof(struct serio), GFP_KERNEL);
-       if (serio) {
-               *values = i8042_aux_values;
-               snprintf(values->name, sizeof(values->name), "AUX%d", index);
-               values->mux = index;
-
-               memset(serio, 0, sizeof(struct serio));
-               serio->type             = SERIO_8042;
-               serio->write            = i8042_aux_write;
-               serio->open             = i8042_open;
-               serio->close            = i8042_close;
-               serio->port_data        = values;
-               serio->dev.parent       = &i8042_platform_device->dev;
-               snprintf(serio->name, sizeof(serio->name), "i8042 Aux-%d Port", index);
-               snprintf(serio->phys, sizeof(serio->phys), I8042_MUX_PHYS_DESC, index + 1);
+       kfree(i8042_ports[I8042_KBD_PORT_NO].serio);
+       i8042_ports[I8042_KBD_PORT_NO].serio = NULL;
+}
+
+static void __devinit i8042_free_aux_ports(void)
+{
+       int i;
+
+       for (i = I8042_AUX_PORT_NO; i < I8042_NUM_PORTS; i++) {
+               kfree(i8042_ports[i].serio);
+               i8042_ports[i].serio = NULL;
        }
+}
+
+static void __devinit i8042_register_ports(void)
+{
+       int i;
 
-       return serio;
+       for (i = 0; i < I8042_NUM_PORTS; i++) {
+               if (i8042_ports[i].serio) {
+                       printk(KERN_INFO "serio: %s at %#lx,%#lx irq %d\n",
+                               i8042_ports[i].serio->name,
+                               (unsigned long) I8042_DATA_REG,
+                               (unsigned long) I8042_COMMAND_REG,
+                               i8042_ports[i].irq);
+                       serio_register_port(i8042_ports[i].serio);
+               }
+       }
 }
 
-int __init i8042_init(void)
+static void __devinit i8042_unregister_ports(void)
 {
        int i;
-       int err;
 
-       dbg_init();
+       for (i = 0; i < I8042_NUM_PORTS; i++) {
+               if (i8042_ports[i].serio) {
+                       serio_unregister_port(i8042_ports[i].serio);
+                       i8042_ports[i].serio = NULL;
+               }
+       }
+}
 
-       init_timer(&i8042_timer);
-       i8042_timer.function = i8042_timer_func;
+static void i8042_free_irqs(void)
+{
+       if (i8042_aux_irq_registered)
+               free_irq(I8042_AUX_IRQ, i8042_platform_device);
+       if (i8042_kbd_irq_registered)
+               free_irq(I8042_KBD_IRQ, i8042_platform_device);
 
-       if (i8042_platform_init())
-               return -EBUSY;
+       i8042_aux_irq_registered = i8042_kbd_irq_registered = 0;
+}
 
-       i8042_aux_values.irq = I8042_AUX_IRQ;
-       i8042_kbd_values.irq = I8042_KBD_IRQ;
+static int __devinit i8042_setup_aux(void)
+{
+       int (*aux_enable)(void);
+       int error;
+       int i;
 
-       if (i8042_controller_init())
+       if (i8042_check_aux())
                return -ENODEV;
 
-       err = driver_register(&i8042_driver);
-       if (err)
-               return err;
+       if (i8042_nomux || i8042_check_mux()) {
+               error = i8042_create_aux_port(-1);
+               if (error)
+                       goto err_free_ports;
+               aux_enable = i8042_enable_aux_port;
+       } else {
+               for (i = 0; i < I8042_NUM_MUX_PORTS; i++) {
+                       error = i8042_create_aux_port(i);
+                       if (error)
+                               goto err_free_ports;
+               }
+               aux_enable = i8042_enable_mux_ports;
+       }
+
+       error = request_irq(I8042_AUX_IRQ, i8042_interrupt, IRQF_SHARED,
+                           "i8042", i8042_platform_device);
+       if (error)
+               goto err_free_ports;
+
+       if (aux_enable())
+               goto err_free_irq;
+
+       i8042_aux_irq_registered = 1;
+       return 0;
+
+ err_free_irq:
+       free_irq(I8042_AUX_IRQ, i8042_platform_device);
+ err_free_ports:
+       i8042_free_aux_ports();
+       return error;
+}
+
+static int __devinit i8042_setup_kbd(void)
+{
+       int error;
 
-       i8042_platform_device = platform_device_register_simple("i8042", -1, NULL, 0);
-       if (IS_ERR(i8042_platform_device)) {
-               driver_unregister(&i8042_driver);
-               return PTR_ERR(i8042_platform_device);
+       error = i8042_create_kbd_port();
+       if (error)
+               return error;
+
+       error = request_irq(I8042_KBD_IRQ, i8042_interrupt, IRQF_SHARED,
+                           "i8042", i8042_platform_device);
+       if (error)
+               goto err_free_port;
+
+       error = i8042_enable_kbd_port();
+       if (error)
+               goto err_free_irq;
+
+       i8042_kbd_irq_registered = 1;
+       return 0;
+
+ err_free_irq:
+       free_irq(I8042_KBD_IRQ, i8042_platform_device);
+ err_free_port:
+       i8042_free_kbd_port();
+       return error;
+}
+
+static int __devinit i8042_probe(struct platform_device *dev)
+{
+       int error;
+
+       error = i8042_controller_selftest();
+       if (error)
+               return error;
+
+       error = i8042_controller_init();
+       if (error)
+               return error;
+
+       if (!i8042_noaux) {
+               error = i8042_setup_aux();
+               if (error && error != -ENODEV && error != -EBUSY)
+                       goto out_fail;
        }
 
-       if (!i8042_noaux && !i8042_check_aux(&i8042_aux_values)) {
-               if (!i8042_nomux && !i8042_check_mux(&i8042_aux_values))
-                       for (i = 0; i < I8042_NUM_MUX_PORTS; i++) {
-                               i8042_mux_port[i] = i8042_allocate_mux_port(i);
-                               if (i8042_mux_port[i])
-                                       i8042_port_register(i8042_mux_port[i]);
-                       }
-               else {
-                       i8042_aux_port = i8042_allocate_aux_port();
-                       if (i8042_aux_port)
-                               i8042_port_register(i8042_aux_port);
-               }
+       if (!i8042_nokbd) {
+               error = i8042_setup_kbd();
+               if (error)
+                       goto out_fail;
        }
 
-       i8042_kbd_port = i8042_allocate_kbd_port();
-       if (i8042_kbd_port)
-               i8042_port_register(i8042_kbd_port);
+/*
+ * Ok, everything is ready, let's register all serio ports
+ */
+       i8042_register_ports();
+
+       return 0;
+
+ out_fail:
+       i8042_free_aux_ports(); /* in case KBD failed but AUX not */
+       i8042_free_irqs();
+       i8042_controller_reset();
 
-       mod_timer(&i8042_timer, jiffies + I8042_POLL_PERIOD);
+       return error;
+}
+
+static int __devexit i8042_remove(struct platform_device *dev)
+{
+       i8042_unregister_ports();
+       i8042_free_irqs();
+       i8042_controller_reset();
 
        return 0;
 }
 
-void __exit i8042_exit(void)
+static struct platform_driver i8042_driver = {
+       .driver         = {
+               .name   = "i8042",
+               .owner  = THIS_MODULE,
+       },
+       .probe          = i8042_probe,
+       .remove         = __devexit_p(i8042_remove),
+       .suspend        = i8042_suspend,
+       .resume         = i8042_resume,
+       .shutdown       = i8042_shutdown,
+};
+
+static int __init i8042_init(void)
 {
-       int i;
+       int err;
 
-       i8042_controller_cleanup();
+       dbg_init();
+
+       err = i8042_platform_init();
+       if (err)
+               return err;
+
+       err = i8042_controller_check();
+       if (err)
+               goto err_platform_exit;
 
-       if (i8042_kbd_values.exists)
-               serio_unregister_port(i8042_kbd_port);
+       err = platform_driver_register(&i8042_driver);
+       if (err)
+               goto err_platform_exit;
 
-       if (i8042_aux_values.exists)
-               serio_unregister_port(i8042_aux_port);
+       i8042_platform_device = platform_device_alloc("i8042", -1);
+       if (!i8042_platform_device) {
+               err = -ENOMEM;
+               goto err_unregister_driver;
+       }
 
-       for (i = 0; i < I8042_NUM_MUX_PORTS; i++)
-               if (i8042_mux_values[i].exists)
-                       serio_unregister_port(i8042_mux_port[i]);
+       err = platform_device_add(i8042_platform_device);
+       if (err)
+               goto err_free_device;
 
-       del_timer_sync(&i8042_timer);
+       panic_blink = i8042_panic_blink;
 
-       platform_device_unregister(i8042_platform_device);
-       driver_unregister(&i8042_driver);
+       return 0;
 
+ err_free_device:
+       platform_device_put(i8042_platform_device);
+ err_unregister_driver:
+       platform_driver_unregister(&i8042_driver);
+ err_platform_exit:
+       i8042_platform_exit();
+
+       return err;
+}
+
+static void __exit i8042_exit(void)
+{
+       platform_device_unregister(i8042_platform_device);
+       platform_driver_unregister(&i8042_driver);
        i8042_platform_exit();
 
        panic_blink = NULL;