input: add a driver for the Winbond WPCD376I Consumer IR hardware
[safe/jmp/linux-2.6] / drivers / input / misc / wistron_btns.c
index e1183ae..11fd038 100644 (file)
 #include <linux/io.h>
 #include <linux/dmi.h>
 #include <linux/init.h>
-#include <linux/input.h>
+#include <linux/input-polldev.h>
 #include <linux/interrupt.h>
+#include <linux/jiffies.h>
 #include <linux/kernel.h>
 #include <linux/mc146818rtc.h>
 #include <linux/module.h>
 #include <linux/preempt.h>
 #include <linux/string.h>
-#include <linux/timer.h>
 #include <linux/types.h>
 #include <linux/platform_device.h>
+#include <linux/leds.h>
 
-/*
- * Number of attempts to read data from queue per poll;
- * the queue can hold up to 31 entries
- */
-#define MAX_POLL_ITERATIONS 64
-
-#define POLL_FREQUENCY 10 /* Number of polls per second */
-
-#if POLL_FREQUENCY > HZ
-#error "POLL_FREQUENCY too high"
-#endif
+/* How often we poll keys - msecs */
+#define POLL_INTERVAL_DEFAULT  500 /* when idle */
+#define POLL_INTERVAL_BURST    100 /* when a key was recently pressed */
 
 /* BIOS subsystem IDs */
 #define WIFI           0x35
 #define BLUETOOTH      0x34
+#define MAIL_LED       0x31
 
 MODULE_AUTHOR("Miloslav Trmac <mitr@volny.cz>");
 MODULE_DESCRIPTION("Wistron laptop button driver");
 MODULE_LICENSE("GPL v2");
-MODULE_VERSION("0.1");
+MODULE_VERSION("0.3");
 
 static int force; /* = 0; */
 module_param(force, bool, 0);
@@ -58,7 +52,7 @@ MODULE_PARM_DESC(force, "Load even if computer is not in database");
 
 static char *keymap_name; /* = NULL; */
 module_param_named(keymap, keymap_name, charp, 0);
-MODULE_PARM_DESC(keymap, "Keymap name, if it can't be autodetected");
+MODULE_PARM_DESC(keymap, "Keymap name, if it can't be autodetected [generic, 1557/MS2141]");
 
 static struct platform_device *wistron_device;
 
@@ -233,119 +227,418 @@ static void bios_set_state(u8 subsys, int enable)
 struct key_entry {
        char type;              /* See KE_* below */
        u8 code;
-       unsigned keycode;       /* For KE_KEY */
+       union {
+               u16 keycode;            /* For KE_KEY */
+               struct {                /* For KE_SW */
+                       u8 code;
+                       u8 value;
+               } sw;
+       };
 };
 
-enum { KE_END, KE_KEY, KE_WIFI, KE_BLUETOOTH };
+enum { KE_END, KE_KEY, KE_SW, KE_WIFI, KE_BLUETOOTH };
+
+#define FE_MAIL_LED 0x01
+#define FE_WIFI_LED 0x02
+#define FE_UNTESTED 0x80
 
-static const struct key_entry *keymap; /* = NULL; Current key map */
-static int have_wifi;
-static int have_bluetooth;
+static struct key_entry *keymap; /* = NULL; Current key map */
+static bool have_wifi;
+static bool have_bluetooth;
+static int leds_present;       /* bitmask of leds present */
 
-static int __init dmi_matched(struct dmi_system_id *dmi)
+static int __init dmi_matched(const struct dmi_system_id *dmi)
 {
        const struct key_entry *key;
 
        keymap = dmi->driver_data;
        for (key = keymap; key->type != KE_END; key++) {
                if (key->type == KE_WIFI)
-                       have_wifi = 1;
+                       have_wifi = true;
                else if (key->type == KE_BLUETOOTH)
-                       have_bluetooth = 1;
+                       have_bluetooth = true;
        }
+       leds_present = key->code & (FE_MAIL_LED | FE_WIFI_LED);
+
        return 1;
 }
 
-static struct key_entry keymap_empty[] = {
+static struct key_entry keymap_empty[] __initdata = {
        { KE_END, 0 }
 };
 
-static struct key_entry keymap_fs_amilo_pro_v2000[] = {
-       { KE_KEY,  0x01, KEY_HELP },
-       { KE_KEY,  0x11, KEY_PROG1 },
-       { KE_KEY,  0x12, KEY_PROG2 },
-       { KE_WIFI, 0x30, 0 },
-       { KE_KEY,  0x31, KEY_MAIL },
-       { KE_KEY,  0x36, KEY_WWW },
+static struct key_entry keymap_fs_amilo_pro_v2000[] __initdata = {
+       { KE_KEY,  0x01, {KEY_HELP} },
+       { KE_KEY,  0x11, {KEY_PROG1} },
+       { KE_KEY,  0x12, {KEY_PROG2} },
+       { KE_WIFI, 0x30 },
+       { KE_KEY,  0x31, {KEY_MAIL} },
+       { KE_KEY,  0x36, {KEY_WWW} },
        { KE_END,  0 }
 };
 
-static struct key_entry keymap_fujitsu_n3510[] = {
-       { KE_KEY, 0x11, KEY_PROG1 },
-       { KE_KEY, 0x12, KEY_PROG2 },
-       { KE_KEY, 0x36, KEY_WWW },
-       { KE_KEY, 0x31, KEY_MAIL },
-       { KE_KEY, 0x71, KEY_STOPCD },
-       { KE_KEY, 0x72, KEY_PLAYPAUSE },
-       { KE_KEY, 0x74, KEY_REWIND },
-       { KE_KEY, 0x78, KEY_FORWARD },
+static struct key_entry keymap_fs_amilo_pro_v3505[] __initdata = {
+       { KE_KEY,       0x01, {KEY_HELP} },          /* Fn+F1 */
+       { KE_KEY,       0x06, {KEY_DISPLAYTOGGLE} }, /* Fn+F4 */
+       { KE_BLUETOOTH, 0x30 },                      /* Fn+F10 */
+       { KE_KEY,       0x31, {KEY_MAIL} },          /* mail button */
+       { KE_KEY,       0x36, {KEY_WWW} },           /* www button */
+       { KE_WIFI,      0x78 },                      /* satelite dish button */
+       { KE_END,       0 }
+};
+
+static struct key_entry keymap_fujitsu_n3510[] __initdata = {
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x71, {KEY_STOPCD} },
+       { KE_KEY, 0x72, {KEY_PLAYPAUSE} },
+       { KE_KEY, 0x74, {KEY_REWIND} },
+       { KE_KEY, 0x78, {KEY_FORWARD} },
        { KE_END, 0 }
 };
 
-static struct key_entry keymap_wistron_ms2111[] = {
-       { KE_KEY,  0x11, KEY_PROG1 },
-       { KE_KEY,  0x12, KEY_PROG2 },
-       { KE_KEY,  0x13, KEY_PROG3 },
-       { KE_KEY,  0x31, KEY_MAIL },
-       { KE_KEY,  0x36, KEY_WWW },
-       { KE_END,  0 }
+static struct key_entry keymap_wistron_ms2111[] __initdata = {
+       { KE_KEY,  0x11, {KEY_PROG1} },
+       { KE_KEY,  0x12, {KEY_PROG2} },
+       { KE_KEY,  0x13, {KEY_PROG3} },
+       { KE_KEY,  0x31, {KEY_MAIL} },
+       { KE_KEY,  0x36, {KEY_WWW} },
+       { KE_END, FE_MAIL_LED }
+};
+
+static struct key_entry keymap_wistron_md40100[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x37, {KEY_DISPLAYTOGGLE} }, /* Display on/off */
+       { KE_END, FE_MAIL_LED | FE_WIFI_LED | FE_UNTESTED }
 };
 
-static struct key_entry keymap_wistron_ms2141[] = {
-       { KE_KEY,  0x11, KEY_PROG1 },
-       { KE_KEY,  0x12, KEY_PROG2 },
-       { KE_WIFI, 0x30, 0 },
-       { KE_KEY,  0x22, KEY_REWIND },
-       { KE_KEY,  0x23, KEY_FORWARD },
-       { KE_KEY,  0x24, KEY_PLAYPAUSE },
-       { KE_KEY,  0x25, KEY_STOPCD },
-       { KE_KEY,  0x31, KEY_MAIL },
-       { KE_KEY,  0x36, KEY_WWW },
+static struct key_entry keymap_wistron_ms2141[] __initdata = {
+       { KE_KEY,  0x11, {KEY_PROG1} },
+       { KE_KEY,  0x12, {KEY_PROG2} },
+       { KE_WIFI, 0x30 },
+       { KE_KEY,  0x22, {KEY_REWIND} },
+       { KE_KEY,  0x23, {KEY_FORWARD} },
+       { KE_KEY,  0x24, {KEY_PLAYPAUSE} },
+       { KE_KEY,  0x25, {KEY_STOPCD} },
+       { KE_KEY,  0x31, {KEY_MAIL} },
+       { KE_KEY,  0x36, {KEY_WWW} },
        { KE_END,  0 }
 };
 
-static struct key_entry keymap_acer_aspire_1500[] = {
-       { KE_KEY, 0x11, KEY_PROG1 },
-       { KE_KEY, 0x12, KEY_PROG2 },
-       { KE_WIFI, 0x30, 0 },
-       { KE_KEY, 0x31, KEY_MAIL },
-       { KE_KEY, 0x36, KEY_WWW },
-       { KE_BLUETOOTH, 0x44, 0 },
-       { KE_END, 0 }
+static struct key_entry keymap_acer_aspire_1500[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x03, {KEY_POWER} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_WIFI, 0x30 },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x49, {KEY_CONFIG} },
+       { KE_BLUETOOTH, 0x44 },
+       { KE_END, FE_UNTESTED }
 };
 
-static struct key_entry keymap_acer_travelmate_240[] = {
-       { KE_KEY, 0x31, KEY_MAIL },
-       { KE_KEY, 0x36, KEY_WWW },
-       { KE_KEY, 0x11, KEY_PROG1 },
-       { KE_KEY, 0x12, KEY_PROG2 },
-       { KE_BLUETOOTH, 0x44, 0 },
-       { KE_WIFI, 0x30, 0 },
-       { KE_END, 0 }
+static struct key_entry keymap_acer_aspire_1600[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x03, {KEY_POWER} },
+       { KE_KEY, 0x08, {KEY_MUTE} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x13, {KEY_PROG3} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x49, {KEY_CONFIG} },
+       { KE_WIFI, 0x30 },
+       { KE_BLUETOOTH, 0x44 },
+       { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+/* 3020 has been tested */
+static struct key_entry keymap_acer_aspire_5020[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x03, {KEY_POWER} },
+       { KE_KEY, 0x05, {KEY_SWITCHVIDEOMODE} }, /* Display selection */
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x6a, {KEY_CONFIG} },
+       { KE_WIFI, 0x30 },
+       { KE_BLUETOOTH, 0x44 },
+       { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_2410[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x6d, {KEY_POWER} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x6a, {KEY_CONFIG} },
+       { KE_WIFI, 0x30 },
+       { KE_BLUETOOTH, 0x44 },
+       { KE_END, FE_MAIL_LED | FE_UNTESTED }
 };
 
-static struct key_entry keymap_aopen_1559as[] = {
-       { KE_KEY,  0x01, KEY_HELP },
-       { KE_KEY,  0x06, KEY_PROG3 },
-       { KE_KEY,  0x11, KEY_PROG1 },
-       { KE_KEY,  0x12, KEY_PROG2 },
-       { KE_WIFI, 0x30, 0 },
-       { KE_KEY,  0x31, KEY_MAIL },
-       { KE_KEY,  0x36, KEY_WWW },
+static struct key_entry keymap_acer_travelmate_110[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x03, {KEY_POWER} },
+       { KE_KEY, 0x08, {KEY_MUTE} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+       { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_SW, 0x4a, {.sw = {SW_LID, 1}} }, /* lid close */
+       { KE_SW, 0x4b, {.sw = {SW_LID, 0}} }, /* lid open */
+       { KE_WIFI, 0x30 },
+       { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_300[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x03, {KEY_POWER} },
+       { KE_KEY, 0x08, {KEY_MUTE} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+       { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_WIFI, 0x30 },
+       { KE_BLUETOOTH, 0x44 },
+       { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_380[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x03, {KEY_POWER} }, /* not 370 */
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x13, {KEY_PROG3} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_WIFI, 0x30 },
+       { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+/* unusual map */
+static struct key_entry keymap_acer_travelmate_220[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x11, {KEY_MAIL} },
+       { KE_KEY, 0x12, {KEY_WWW} },
+       { KE_KEY, 0x13, {KEY_PROG2} },
+       { KE_KEY, 0x31, {KEY_PROG1} },
+       { KE_END, FE_WIFI_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_230[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_END, FE_WIFI_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_240[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x03, {KEY_POWER} },
+       { KE_KEY, 0x08, {KEY_MUTE} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_BLUETOOTH, 0x44 },
+       { KE_WIFI, 0x30 },
+       { KE_END, FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_350[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x13, {KEY_MAIL} },
+       { KE_KEY, 0x14, {KEY_PROG3} },
+       { KE_KEY, 0x15, {KEY_WWW} },
+       { KE_END, FE_MAIL_LED | FE_WIFI_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_acer_travelmate_360[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x13, {KEY_MAIL} },
+       { KE_KEY, 0x14, {KEY_PROG3} },
+       { KE_KEY, 0x15, {KEY_WWW} },
+       { KE_KEY, 0x40, {KEY_WLAN} },
+       { KE_END, FE_WIFI_LED | FE_UNTESTED } /* no mail led */
+};
+
+/* Wifi subsystem only activates the led. Therefore we need to pass
+ * wifi event as a normal key, then userspace can really change the wifi state.
+ * TODO we need to export led state to userspace (wifi and mail) */
+static struct key_entry keymap_acer_travelmate_610[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x13, {KEY_PROG3} },
+       { KE_KEY, 0x14, {KEY_MAIL} },
+       { KE_KEY, 0x15, {KEY_WWW} },
+       { KE_KEY, 0x40, {KEY_WLAN} },
+       { KE_END, FE_MAIL_LED | FE_WIFI_LED }
+};
+
+static struct key_entry keymap_acer_travelmate_630[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x03, {KEY_POWER} },
+       { KE_KEY, 0x08, {KEY_MUTE} }, /* not 620 */
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x13, {KEY_PROG3} },
+       { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+       { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_WIFI, 0x30 },
+       { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_aopen_1559as[] __initdata = {
+       { KE_KEY,  0x01, {KEY_HELP} },
+       { KE_KEY,  0x06, {KEY_PROG3} },
+       { KE_KEY,  0x11, {KEY_PROG1} },
+       { KE_KEY,  0x12, {KEY_PROG2} },
+       { KE_WIFI, 0x30 },
+       { KE_KEY,  0x31, {KEY_MAIL} },
+       { KE_KEY,  0x36, {KEY_WWW} },
        { KE_END,  0 },
 };
 
-static struct key_entry keymap_fs_amilo_d88x0[] = {
-       { KE_KEY, 0x01, KEY_HELP },
-       { KE_KEY, 0x08, KEY_MUTE },
-       { KE_KEY, 0x31, KEY_MAIL },
-       { KE_KEY, 0x36, KEY_WWW },
-       { KE_KEY, 0x11, KEY_PROG1 },
-       { KE_KEY, 0x12, KEY_PROG2 },
-       { KE_KEY, 0x13, KEY_PROG3 },
+static struct key_entry keymap_fs_amilo_d88x0[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x08, {KEY_MUTE} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x13, {KEY_PROG3} },
+       { KE_END, FE_MAIL_LED | FE_WIFI_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_wistron_md2900[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_WIFI, 0x30 },
+       { KE_END, FE_MAIL_LED | FE_UNTESTED }
+};
+
+static struct key_entry keymap_wistron_md96500[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x05, {KEY_SWITCHVIDEOMODE} }, /* Display selection */
+       { KE_KEY, 0x06, {KEY_DISPLAYTOGGLE} }, /* Display on/off */
+       { KE_KEY, 0x08, {KEY_MUTE} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+       { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+       { KE_KEY, 0x22, {KEY_REWIND} },
+       { KE_KEY, 0x23, {KEY_FORWARD} },
+       { KE_KEY, 0x24, {KEY_PLAYPAUSE} },
+       { KE_KEY, 0x25, {KEY_STOPCD} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_WIFI, 0x30 },
+       { KE_BLUETOOTH, 0x44 },
+       { KE_END, FE_UNTESTED }
+};
+
+static struct key_entry keymap_wistron_generic[] __initdata = {
+       { KE_KEY, 0x01, {KEY_HELP} },
+       { KE_KEY, 0x02, {KEY_CONFIG} },
+       { KE_KEY, 0x03, {KEY_POWER} },
+       { KE_KEY, 0x05, {KEY_SWITCHVIDEOMODE} }, /* Display selection */
+       { KE_KEY, 0x06, {KEY_DISPLAYTOGGLE} }, /* Display on/off */
+       { KE_KEY, 0x08, {KEY_MUTE} },
+       { KE_KEY, 0x11, {KEY_PROG1} },
+       { KE_KEY, 0x12, {KEY_PROG2} },
+       { KE_KEY, 0x13, {KEY_PROG3} },
+       { KE_KEY, 0x14, {KEY_MAIL} },
+       { KE_KEY, 0x15, {KEY_WWW} },
+       { KE_KEY, 0x20, {KEY_VOLUMEUP} },
+       { KE_KEY, 0x21, {KEY_VOLUMEDOWN} },
+       { KE_KEY, 0x22, {KEY_REWIND} },
+       { KE_KEY, 0x23, {KEY_FORWARD} },
+       { KE_KEY, 0x24, {KEY_PLAYPAUSE} },
+       { KE_KEY, 0x25, {KEY_STOPCD} },
+       { KE_KEY, 0x31, {KEY_MAIL} },
+       { KE_KEY, 0x36, {KEY_WWW} },
+       { KE_KEY, 0x37, {KEY_DISPLAYTOGGLE} }, /* Display on/off */
+       { KE_KEY, 0x40, {KEY_WLAN} },
+       { KE_KEY, 0x49, {KEY_CONFIG} },
+       { KE_SW, 0x4a, {.sw = {SW_LID, 1}} }, /* lid close */
+       { KE_SW, 0x4b, {.sw = {SW_LID, 0}} }, /* lid open */
+       { KE_KEY, 0x6a, {KEY_CONFIG} },
+       { KE_KEY, 0x6d, {KEY_POWER} },
+       { KE_KEY, 0x71, {KEY_STOPCD} },
+       { KE_KEY, 0x72, {KEY_PLAYPAUSE} },
+       { KE_KEY, 0x74, {KEY_REWIND} },
+       { KE_KEY, 0x78, {KEY_FORWARD} },
+       { KE_WIFI, 0x30 },
+       { KE_BLUETOOTH, 0x44 },
        { KE_END, 0 }
 };
 
+static struct key_entry keymap_aopen_1557[] __initdata = {
+       { KE_KEY,  0x01, {KEY_HELP} },
+       { KE_KEY,  0x11, {KEY_PROG1} },
+       { KE_KEY,  0x12, {KEY_PROG2} },
+       { KE_WIFI, 0x30 },
+       { KE_KEY,  0x22, {KEY_REWIND} },
+       { KE_KEY,  0x23, {KEY_FORWARD} },
+       { KE_KEY,  0x24, {KEY_PLAYPAUSE} },
+       { KE_KEY,  0x25, {KEY_STOPCD} },
+       { KE_KEY,  0x31, {KEY_MAIL} },
+       { KE_KEY,  0x36, {KEY_WWW} },
+       { KE_END,  0 }
+};
+
+static struct key_entry keymap_prestigio[] __initdata = {
+       { KE_KEY,  0x11, {KEY_PROG1} },
+       { KE_KEY,  0x12, {KEY_PROG2} },
+       { KE_WIFI, 0x30 },
+       { KE_KEY,  0x22, {KEY_REWIND} },
+       { KE_KEY,  0x23, {KEY_FORWARD} },
+       { KE_KEY,  0x24, {KEY_PLAYPAUSE} },
+       { KE_KEY,  0x25, {KEY_STOPCD} },
+       { KE_KEY,  0x31, {KEY_MAIL} },
+       { KE_KEY,  0x36, {KEY_WWW} },
+       { KE_END,  0 }
+};
+
+
 /*
  * If your machine is not here (which is currently rather likely), please send
  * a list of buttons and their key codes (reported when loading this module
@@ -363,6 +656,15 @@ static struct dmi_system_id dmi_ids[] __initdata = {
        },
        {
                .callback = dmi_matched,
+               .ident = "Fujitsu-Siemens Amilo Pro Edition V3505",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro Edition V3505"),
+               },
+               .driver_data = keymap_fs_amilo_pro_v3505
+       },
+       {
+               .callback = dmi_matched,
                .ident = "Fujitsu-Siemens Amilo M7400",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
@@ -372,6 +674,15 @@ static struct dmi_system_id dmi_ids[] __initdata = {
        },
        {
                .callback = dmi_matched,
+               .ident = "Maxdata Pro 7000 DX",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "MAXDATA"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Pro 7000"),
+               },
+               .driver_data = keymap_fs_amilo_pro_v2000
+       },
+       {
+               .callback = dmi_matched,
                .ident = "Fujitsu N3510",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"),
@@ -390,6 +701,133 @@ static struct dmi_system_id dmi_ids[] __initdata = {
        },
        {
                .callback = dmi_matched,
+               .ident = "Acer Aspire 1600",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1600"),
+               },
+               .driver_data = keymap_acer_aspire_1600
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer Aspire 3020",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 3020"),
+               },
+               .driver_data = keymap_acer_aspire_5020
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer Aspire 5020",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5020"),
+               },
+               .driver_data = keymap_acer_aspire_5020
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 2100",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2100"),
+               },
+               .driver_data = keymap_acer_aspire_5020
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 2410",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2410"),
+               },
+               .driver_data = keymap_acer_travelmate_2410
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate C300",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C300"),
+               },
+               .driver_data = keymap_acer_travelmate_300
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate C100",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C100"),
+               },
+               .driver_data = keymap_acer_travelmate_300
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate C110",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate C110"),
+               },
+               .driver_data = keymap_acer_travelmate_110
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 380",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 380"),
+               },
+               .driver_data = keymap_acer_travelmate_380
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 370",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 370"),
+               },
+               .driver_data = keymap_acer_travelmate_380 /* keyboard minus 1 key */
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 220",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 220"),
+               },
+               .driver_data = keymap_acer_travelmate_220
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 260",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 260"),
+               },
+               .driver_data = keymap_acer_travelmate_220
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 230",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 230"),
+                       /* acerhk looks for "TravelMate F4..." ?! */
+               },
+               .driver_data = keymap_acer_travelmate_230
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 280",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 280"),
+               },
+               .driver_data = keymap_acer_travelmate_230
+       },
+       {
+               .callback = dmi_matched,
                .ident = "Acer TravelMate 240",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -399,6 +837,15 @@ static struct dmi_system_id dmi_ids[] __initdata = {
        },
        {
                .callback = dmi_matched,
+               .ident = "Acer TravelMate 250",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 250"),
+               },
+               .driver_data = keymap_acer_travelmate_240
+       },
+       {
+               .callback = dmi_matched,
                .ident = "Acer TravelMate 2424NWXCi",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
@@ -408,6 +855,51 @@ static struct dmi_system_id dmi_ids[] __initdata = {
        },
        {
                .callback = dmi_matched,
+               .ident = "Acer TravelMate 350",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 350"),
+               },
+               .driver_data = keymap_acer_travelmate_350
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 360",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
+               },
+               .driver_data = keymap_acer_travelmate_360
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 610",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "ACER"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 610"),
+               },
+               .driver_data = keymap_acer_travelmate_610
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 620",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 620"),
+               },
+               .driver_data = keymap_acer_travelmate_630
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Acer TravelMate 630",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 630"),
+               },
+               .driver_data = keymap_acer_travelmate_630
+       },
+       {
+               .callback = dmi_matched,
                .ident = "AOpen 1559AS",
                .matches = {
                        DMI_MATCH(DMI_PRODUCT_NAME, "E2U"),
@@ -426,6 +918,51 @@ static struct dmi_system_id dmi_ids[] __initdata = {
        },
        {
                .callback = dmi_matched,
+               .ident = "Medion MD 40100",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "WID2000"),
+               },
+               .driver_data = keymap_wistron_md40100
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Medion MD 2900",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "MEDIONNB"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2000"),
+               },
+               .driver_data = keymap_wistron_md2900
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Medion MD 96500",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2040"),
+               },
+               .driver_data = keymap_wistron_md96500
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Medion MD 95400",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "MEDIONPC"),
+                       DMI_MATCH(DMI_PRODUCT_NAME, "WIM 2050"),
+               },
+               .driver_data = keymap_wistron_md96500
+       },
+       {
+               .callback = dmi_matched,
+               .ident = "Fujitsu Siemens Amilo D7820",
+               .matches = {
+                       DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), /* not sure */
+                       DMI_MATCH(DMI_PRODUCT_NAME, "Amilo D"),
+               },
+               .driver_data = keymap_fs_amilo_d88x0
+       },
+       {
+               .callback = dmi_matched,
                .ident = "Fujitsu Siemens Amilo D88x0",
                .matches = {
                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
@@ -436,17 +973,43 @@ static struct dmi_system_id dmi_ids[] __initdata = {
        { NULL, }
 };
 
+/* Copy the good keymap, as the original ones are free'd */
+static int __init copy_keymap(void)
+{
+       const struct key_entry *key;
+       struct key_entry *new_keymap;
+       unsigned int length = 1;
+
+       for (key = keymap; key->type != KE_END; key++)
+               length++;
+
+       new_keymap = kmalloc(length * sizeof(struct key_entry), GFP_KERNEL);
+       if (!new_keymap)
+               return -ENOMEM;
+
+       memcpy(new_keymap, keymap, length * sizeof(struct key_entry));
+       keymap = new_keymap;
+
+       return 0;
+}
+
 static int __init select_keymap(void)
 {
+       dmi_check_system(dmi_ids);
        if (keymap_name != NULL) {
                if (strcmp (keymap_name, "1557/MS2141") == 0)
                        keymap = keymap_wistron_ms2141;
+               else if (strcmp (keymap_name, "aopen1557") == 0)
+                       keymap = keymap_aopen_1557;
+               else if (strcmp (keymap_name, "prestigio") == 0)
+                       keymap = keymap_prestigio;
+               else if (strcmp (keymap_name, "generic") == 0)
+                       keymap = keymap_wistron_generic;
                else {
                        printk(KERN_ERR "wistron_btns: Keymap unknown\n");
                        return -EINVAL;
                }
        }
-       dmi_check_system(dmi_ids);
        if (keymap == NULL) {
                if (!force) {
                        printk(KERN_ERR "wistron_btns: System unknown\n");
@@ -454,96 +1017,169 @@ static int __init select_keymap(void)
                }
                keymap = keymap_empty;
        }
-       return 0;
+
+       return copy_keymap();
 }
 
  /* Input layer interface */
 
-static struct input_dev *input_dev;
+static struct input_polled_dev *wistron_idev;
+static unsigned long jiffies_last_press;
+static bool wifi_enabled;
+static bool bluetooth_enabled;
 
-static int __devinit setup_input_dev(void)
+static void report_key(struct input_dev *dev, unsigned int keycode)
 {
-       const struct key_entry *key;
-       int error;
+       input_report_key(dev, keycode, 1);
+       input_sync(dev);
+       input_report_key(dev, keycode, 0);
+       input_sync(dev);
+}
 
-       input_dev = input_allocate_device();
-       if (!input_dev)
-               return -ENOMEM;
+static void report_switch(struct input_dev *dev, unsigned int code, int value)
+{
+       input_report_switch(dev, code, value);
+       input_sync(dev);
+}
 
-       input_dev->name = "Wistron laptop buttons";
-       input_dev->phys = "wistron/input0";
-       input_dev->id.bustype = BUS_HOST;
-       input_dev->cdev.dev = &wistron_device->dev;
 
-       for (key = keymap; key->type != KE_END; key++) {
-               if (key->type == KE_KEY) {
-                       input_dev->evbit[LONG(EV_KEY)] = BIT(EV_KEY);
-                       set_bit(key->keycode, input_dev->keybit);
-               }
+ /* led management */
+static void wistron_mail_led_set(struct led_classdev *led_cdev,
+                               enum led_brightness value)
+{
+       bios_set_state(MAIL_LED, (value != LED_OFF) ? 1 : 0);
+}
+
+/* same as setting up wifi card, but for laptops on which the led is managed */
+static void wistron_wifi_led_set(struct led_classdev *led_cdev,
+                               enum led_brightness value)
+{
+       bios_set_state(WIFI, (value != LED_OFF) ? 1 : 0);
+}
+
+static struct led_classdev wistron_mail_led = {
+       .name                   = "wistron:green:mail",
+       .brightness_set         = wistron_mail_led_set,
+};
+
+static struct led_classdev wistron_wifi_led = {
+       .name                   = "wistron:red:wifi",
+       .brightness_set         = wistron_wifi_led_set,
+};
+
+static void __devinit wistron_led_init(struct device *parent)
+{
+       if (leds_present & FE_WIFI_LED) {
+               u16 wifi = bios_get_default_setting(WIFI);
+               if (wifi & 1) {
+                       wistron_wifi_led.brightness = (wifi & 2) ? LED_FULL : LED_OFF;
+                       if (led_classdev_register(parent, &wistron_wifi_led))
+                               leds_present &= ~FE_WIFI_LED;
+                       else
+                               bios_set_state(WIFI, wistron_wifi_led.brightness);
+
+               } else
+                       leds_present &= ~FE_WIFI_LED;
        }
 
-       error = input_register_device(input_dev);
-       if (error) {
-               input_free_device(input_dev);
-               return error;
+       if (leds_present & FE_MAIL_LED) {
+               /* bios_get_default_setting(MAIL) always retuns 0, so just turn the led off */
+               wistron_mail_led.brightness = LED_OFF;
+               if (led_classdev_register(parent, &wistron_mail_led))
+                       leds_present &= ~FE_MAIL_LED;
+               else
+                       bios_set_state(MAIL_LED, wistron_mail_led.brightness);
        }
+}
 
-       return 0;
+static void __devexit wistron_led_remove(void)
+{
+       if (leds_present & FE_MAIL_LED)
+               led_classdev_unregister(&wistron_mail_led);
+
+       if (leds_present & FE_WIFI_LED)
+               led_classdev_unregister(&wistron_wifi_led);
+}
+
+static inline void wistron_led_suspend(void)
+{
+       if (leds_present & FE_MAIL_LED)
+               led_classdev_suspend(&wistron_mail_led);
+
+       if (leds_present & FE_WIFI_LED)
+               led_classdev_suspend(&wistron_wifi_led);
 }
 
-static void report_key(unsigned keycode)
+static inline void wistron_led_resume(void)
 {
-       input_report_key(input_dev, keycode, 1);
-       input_sync(input_dev);
-       input_report_key(input_dev, keycode, 0);
-       input_sync(input_dev);
+       if (leds_present & FE_MAIL_LED)
+               led_classdev_resume(&wistron_mail_led);
+
+       if (leds_present & FE_WIFI_LED)
+               led_classdev_resume(&wistron_wifi_led);
 }
 
- /* Driver core */
+static struct key_entry *wistron_get_entry_by_scancode(int code)
+{
+       struct key_entry *key;
 
-static int wifi_enabled;
-static int bluetooth_enabled;
+       for (key = keymap; key->type != KE_END; key++)
+               if (code == key->code)
+                       return key;
 
-static void poll_bios(unsigned long);
+       return NULL;
+}
 
-static struct timer_list poll_timer = TIMER_INITIALIZER(poll_bios, 0, 0);
+static struct key_entry *wistron_get_entry_by_keycode(int keycode)
+{
+       struct key_entry *key;
+
+       for (key = keymap; key->type != KE_END; key++)
+               if (key->type == KE_KEY && keycode == key->keycode)
+                       return key;
+
+       return NULL;
+}
 
 static void handle_key(u8 code)
 {
-       const struct key_entry *key;
+       const struct key_entry *key = wistron_get_entry_by_scancode(code);
 
-       for (key = keymap; key->type != KE_END; key++) {
-               if (code == key->code) {
-                       switch (key->type) {
-                       case KE_KEY:
-                               report_key(key->keycode);
-                               break;
+       if (key) {
+               switch (key->type) {
+               case KE_KEY:
+                       report_key(wistron_idev->input, key->keycode);
+                       break;
 
-                       case KE_WIFI:
-                               if (have_wifi) {
-                                       wifi_enabled = !wifi_enabled;
-                                       bios_set_state(WIFI, wifi_enabled);
-                               }
-                               break;
+               case KE_SW:
+                       report_switch(wistron_idev->input,
+                                     key->sw.code, key->sw.value);
+                       break;
 
-                       case KE_BLUETOOTH:
-                               if (have_bluetooth) {
-                                       bluetooth_enabled = !bluetooth_enabled;
-                                       bios_set_state(BLUETOOTH, bluetooth_enabled);
-                               }
-                               break;
+               case KE_WIFI:
+                       if (have_wifi) {
+                               wifi_enabled = !wifi_enabled;
+                               bios_set_state(WIFI, wifi_enabled);
+                       }
+                       break;
 
-                       case KE_END:
-                       default:
-                               BUG();
+               case KE_BLUETOOTH:
+                       if (have_bluetooth) {
+                               bluetooth_enabled = !bluetooth_enabled;
+                               bios_set_state(BLUETOOTH, bluetooth_enabled);
                        }
-                       return;
+                       break;
+
+               default:
+                       BUG();
                }
-       }
-       printk(KERN_NOTICE "wistron_btns: Unknown key code %02X\n", code);
+               jiffies_last_press = jiffies;
+       } else
+               printk(KERN_NOTICE
+                       "wistron_btns: Unknown key code %02X\n", code);
 }
 
-static void poll_bios(unsigned long discard)
+static void poll_bios(bool discard)
 {
        u8 qlen;
        u16 val;
@@ -556,15 +1192,135 @@ static void poll_bios(unsigned long discard)
                if (val != 0 && !discard)
                        handle_key((u8)val);
        }
+}
 
-       mod_timer(&poll_timer, jiffies + HZ / POLL_FREQUENCY);
+static void wistron_flush(struct input_polled_dev *dev)
+{
+       /* Flush stale event queue */
+       poll_bios(true);
 }
 
+static void wistron_poll(struct input_polled_dev *dev)
+{
+       poll_bios(false);
+
+       /* Increase poll frequency if user is currently pressing keys (< 2s ago) */
+       if (time_before(jiffies, jiffies_last_press + 2 * HZ))
+               dev->poll_interval = POLL_INTERVAL_BURST;
+       else
+               dev->poll_interval = POLL_INTERVAL_DEFAULT;
+}
+
+static int wistron_getkeycode(struct input_dev *dev, int scancode, int *keycode)
+{
+       const struct key_entry *key = wistron_get_entry_by_scancode(scancode);
+
+       if (key && key->type == KE_KEY) {
+               *keycode = key->keycode;
+               return 0;
+       }
+
+       return -EINVAL;
+}
+
+static int wistron_setkeycode(struct input_dev *dev, int scancode, int keycode)
+{
+       struct key_entry *key;
+       int old_keycode;
+
+       if (keycode < 0 || keycode > KEY_MAX)
+               return -EINVAL;
+
+       key = wistron_get_entry_by_scancode(scancode);
+       if (key && key->type == KE_KEY) {
+               old_keycode = key->keycode;
+               key->keycode = keycode;
+               set_bit(keycode, dev->keybit);
+               if (!wistron_get_entry_by_keycode(old_keycode))
+                       clear_bit(old_keycode, dev->keybit);
+               return 0;
+       }
+
+       return -EINVAL;
+}
+
+static int __devinit setup_input_dev(void)
+{
+       struct key_entry *key;
+       struct input_dev *input_dev;
+       int error;
+
+       wistron_idev = input_allocate_polled_device();
+       if (!wistron_idev)
+               return -ENOMEM;
+
+       wistron_idev->flush = wistron_flush;
+       wistron_idev->poll = wistron_poll;
+       wistron_idev->poll_interval = POLL_INTERVAL_DEFAULT;
+
+       input_dev = wistron_idev->input;
+       input_dev->name = "Wistron laptop buttons";
+       input_dev->phys = "wistron/input0";
+       input_dev->id.bustype = BUS_HOST;
+       input_dev->dev.parent = &wistron_device->dev;
+
+       input_dev->getkeycode = wistron_getkeycode;
+       input_dev->setkeycode = wistron_setkeycode;
+
+       for (key = keymap; key->type != KE_END; key++) {
+               switch (key->type) {
+                       case KE_KEY:
+                               set_bit(EV_KEY, input_dev->evbit);
+                               set_bit(key->keycode, input_dev->keybit);
+                               break;
+
+                       case KE_SW:
+                               set_bit(EV_SW, input_dev->evbit);
+                               set_bit(key->sw.code, input_dev->swbit);
+                               break;
+
+                       /* if wifi or bluetooth are not available, create normal keys */
+                       case KE_WIFI:
+                               if (!have_wifi) {
+                                       key->type = KE_KEY;
+                                       key->keycode = KEY_WLAN;
+                                       key--;
+                               }
+                               break;
+
+                       case KE_BLUETOOTH:
+                               if (!have_bluetooth) {
+                                       key->type = KE_KEY;
+                                       key->keycode = KEY_BLUETOOTH;
+                                       key--;
+                               }
+                               break;
+
+                       default:
+                               break;
+               }
+       }
+
+       /* reads information flags on KE_END */
+       if (key->code & FE_UNTESTED)
+               printk(KERN_WARNING "Untested laptop multimedia keys, "
+                       "please report success or failure to eric.piel"
+                       "@tremplin-utc.net\n");
+
+       error = input_register_polled_device(wistron_idev);
+       if (error) {
+               input_free_polled_device(wistron_idev);
+               return error;
+       }
+
+       return 0;
+}
+
+/* Driver core */
+
 static int __devinit wistron_probe(struct platform_device *dev)
 {
-       int err = setup_input_dev();
-       if (err)
-               return err;
+       int err;
 
        bios_attach();
        cmos_address = bios_get_cmos_address();
@@ -572,7 +1328,7 @@ static int __devinit wistron_probe(struct platform_device *dev)
        if (have_wifi) {
                u16 wifi = bios_get_default_setting(WIFI);
                if (wifi & 1)
-                       wifi_enabled = (wifi & 2) ? 1 : 0;
+                       wifi_enabled = wifi & 2;
                else
                        have_wifi = 0;
 
@@ -583,43 +1339,50 @@ static int __devinit wistron_probe(struct platform_device *dev)
        if (have_bluetooth) {
                u16 bt = bios_get_default_setting(BLUETOOTH);
                if (bt & 1)
-                       bluetooth_enabled = (bt & 2) ? 1 : 0;
+                       bluetooth_enabled = bt & 2;
                else
-                       have_bluetooth = 0;
+                       have_bluetooth = false;
 
                if (have_bluetooth)
                        bios_set_state(BLUETOOTH, bluetooth_enabled);
        }
 
-       poll_bios(1); /* Flush stale event queue and arm timer */
+       wistron_led_init(&dev->dev);
+
+       err = setup_input_dev();
+       if (err) {
+               bios_detach();
+               return err;
+       }
 
        return 0;
 }
 
 static int __devexit wistron_remove(struct platform_device *dev)
 {
-       del_timer_sync(&poll_timer);
-       input_unregister_device(input_dev);
+       wistron_led_remove();
+       input_unregister_polled_device(wistron_idev);
+       input_free_polled_device(wistron_idev);
        bios_detach();
 
        return 0;
 }
 
 #ifdef CONFIG_PM
-static int wistron_suspend(struct platform_device *dev, pm_message_t state)
+static int wistron_suspend(struct device *dev)
 {
-       del_timer_sync(&poll_timer);
-
        if (have_wifi)
                bios_set_state(WIFI, 0);
 
        if (have_bluetooth)
                bios_set_state(BLUETOOTH, 0);
 
+       wistron_led_suspend();
+
        return 0;
 }
 
-static int wistron_resume(struct platform_device *dev)
+static int wistron_resume(struct device *dev)
 {
        if (have_wifi)
                bios_set_state(WIFI, wifi_enabled);
@@ -627,24 +1390,31 @@ static int wistron_resume(struct platform_device *dev)
        if (have_bluetooth)
                bios_set_state(BLUETOOTH, bluetooth_enabled);
 
-       poll_bios(1);
+       wistron_led_resume();
+
+       poll_bios(true);
 
        return 0;
 }
-#else
-#define wistron_suspend                NULL
-#define wistron_resume         NULL
+
+static const struct dev_pm_ops wistron_pm_ops = {
+       .suspend        = wistron_suspend,
+       .resume         = wistron_resume,
+       .poweroff       = wistron_suspend,
+       .restore        = wistron_resume,
+};
 #endif
 
 static struct platform_driver wistron_driver = {
        .driver         = {
                .name   = "wistron-bios",
                .owner  = THIS_MODULE,
+#if CONFIG_PM
+               .pm     = &wistron_pm_ops,
+#endif
        },
        .probe          = wistron_probe,
        .remove         = __devexit_p(wistron_remove),
-       .suspend        = wistron_suspend,
-       .resume         = wistron_resume,
 };
 
 static int __init wb_module_init(void)
@@ -690,6 +1460,7 @@ static void __exit wb_module_exit(void)
        platform_device_unregister(wistron_device);
        platform_driver_unregister(&wistron_driver);
        unmap_bios();
+       kfree(keymap);
 }
 
 module_init(wb_module_init);