8 files changed, 36 insertions, 18 deletions

diff --git a/drivers/input/keyboard/aaed2000_kbd.c b/drivers/input/keyboard/aaed2000_kbd.c
index a293e8b3f508..8a77bfcd05bc 100644
--- a/drivers/input/keyboard/aaed2000_kbd.c
+++ b/drivers/input/keyboard/aaed2000_kbd.c
@@ -183,4 +183,4 @@ module_exit(aaedkbd_exit);
 
 MODULE_AUTHOR("Nicolas Bellido Y Ortega");
 MODULE_DESCRIPTION("AAED-2000 Keyboard Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/input/keyboard/atkbd.c b/drivers/input/keyboard/atkbd.c
index 4a95adc4cc78..af58a6f1e898 100644
--- a/drivers/input/keyboard/atkbd.c
+++ b/drivers/input/keyboard/atkbd.c
@@ -807,6 +807,8 @@ static int atkbd_activate(struct atkbd *atkbd)
 static void atkbd_cleanup(struct serio *serio)
 {
         struct atkbd *atkbd = serio_get_drvdata(serio);
+
+        atkbd_disable(atkbd);
         ps2_command(&atkbd->ps2dev, NULL, ATKBD_CMD_RESET_BAT);
 }
 
diff --git a/drivers/input/keyboard/corgikbd.c b/drivers/input/keyboard/corgikbd.c
index 29fbec6218b9..1aa46ae12630 100644
--- a/drivers/input/keyboard/corgikbd.c
+++ b/drivers/input/keyboard/corgikbd.c
@@ -412,5 +412,5 @@ module_exit(corgikbd_exit);
 
 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
 MODULE_DESCRIPTION("Corgi Keyboard Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:corgi-keyboard");
diff --git a/drivers/input/keyboard/hilkbd.c b/drivers/input/keyboard/hilkbd.c
index 50d80ecf0b80..aacf71f3cd44 100644
--- a/drivers/input/keyboard/hilkbd.c
+++ b/drivers/input/keyboard/hilkbd.c
@@ -217,6 +217,10 @@ hil_keyb_init(void)
                 return -ENOMEM;
 
 #if defined(CONFIG_HP300)
+        if (!MACH_IS_HP300) {
+                err = -ENODEV;
+                goto err1;
+        }
         if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {
                 printk(KERN_ERR "HIL: hardware register was not found\n");
                 err = -ENODEV;
diff --git a/drivers/input/keyboard/jornada680_kbd.c b/drivers/input/keyboard/jornada680_kbd.c
index 9387da343f97..781fc6102860 100644
--- a/drivers/input/keyboard/jornada680_kbd.c
+++ b/drivers/input/keyboard/jornada680_kbd.c
@@ -275,5 +275,5 @@ module_exit(jornada680kbd_exit);
 
 MODULE_AUTHOR("Kristoffer Ericson <kristoffer.ericson@gmail.com>");
 MODULE_DESCRIPTION("HP Jornada 620/660/680/690 Keyboard Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:jornada680_kbd");
diff --git a/drivers/input/keyboard/jornada720_kbd.c b/drivers/input/keyboard/jornada720_kbd.c
index a1164a0c7736..ce650af6d649 100644
--- a/drivers/input/keyboard/jornada720_kbd.c
+++ b/drivers/input/keyboard/jornada720_kbd.c
@@ -29,7 +29,7 @@
 
 MODULE_AUTHOR("Kristoffer Ericson <Kristoffer.Ericson@gmail.com>");
 MODULE_DESCRIPTION("HP Jornada 710/720/728 keyboard driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
 
 static unsigned short jornada_std_keymap[128] = {                                       /* ROW */
         0, KEY_ESC, KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7,             /* #1  */
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 3dea0c5077a9..45767e73f071 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -136,6 +136,9 @@ static void pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
                 set_bit(code, input_dev->keybit);
         }
 
+        for (i = 0; i < pdata->direct_key_num; i++)
+                set_bit(pdata->direct_key_map[i], input_dev->keybit);
+
         keypad->rotary_up_key[0] = pdata->rotary0_up_key;
         keypad->rotary_up_key[1] = pdata->rotary1_up_key;
         keypad->rotary_down_key[0] = pdata->rotary0_down_key;
@@ -143,17 +146,21 @@ static void pxa27x_keypad_build_keycode(struct pxa27x_keypad *keypad)
         keypad->rotary_rel_code[0] = pdata->rotary0_rel_code;
         keypad->rotary_rel_code[1] = pdata->rotary1_rel_code;
 
-        if (pdata->rotary0_up_key && pdata->rotary0_down_key) {
-                set_bit(pdata->rotary0_up_key, input_dev->keybit);
-                set_bit(pdata->rotary0_down_key, input_dev->keybit);
-        } else
-                set_bit(pdata->rotary0_rel_code, input_dev->relbit);
-
-        if (pdata->rotary1_up_key && pdata->rotary1_down_key) {
-                set_bit(pdata->rotary1_up_key, input_dev->keybit);
-                set_bit(pdata->rotary1_down_key, input_dev->keybit);
-        } else
-                set_bit(pdata->rotary1_rel_code, input_dev->relbit);
+        if (pdata->enable_rotary0) {
+                if (pdata->rotary0_up_key && pdata->rotary0_down_key) {
+                        set_bit(pdata->rotary0_up_key, input_dev->keybit);
+                        set_bit(pdata->rotary0_down_key, input_dev->keybit);
+                } else
+                        set_bit(pdata->rotary0_rel_code, input_dev->relbit);
+        }
+
+        if (pdata->enable_rotary1) {
+                if (pdata->rotary1_up_key && pdata->rotary1_down_key) {
+                        set_bit(pdata->rotary1_up_key, input_dev->keybit);
+                        set_bit(pdata->rotary1_down_key, input_dev->keybit);
+                } else
+                        set_bit(pdata->rotary1_rel_code, input_dev->relbit);
+        }
 }
 
 static inline unsigned int lookup_matrix_keycode(
@@ -484,8 +491,13 @@ static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
         keypad->input_dev = input_dev;
         input_set_drvdata(input_dev, keypad);
 
-        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP) |
-                BIT_MASK(EV_REL);
+        input_dev->evbit[0] = BIT_MASK(EV_KEY) | BIT_MASK(EV_REP);
+        if ((keypad->pdata->enable_rotary0 &&
+                        keypad->pdata->rotary0_rel_code) ||
+            (keypad->pdata->enable_rotary1 &&
+                        keypad->pdata->rotary1_rel_code)) {
+                input_dev->evbit[0] |= BIT_MASK(EV_REL);
+        }
 
         pxa27x_keypad_build_keycode(keypad);
         platform_set_drvdata(pdev, keypad);
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c
index 61e401bc9109..1aa37181c40f 100644
--- a/drivers/input/keyboard/spitzkbd.c
+++ b/drivers/input/keyboard/spitzkbd.c
@@ -494,5 +494,5 @@ module_exit(spitzkbd_exit);
 
 MODULE_AUTHOR("Richard Purdie <rpurdie@rpsys.net>");
 MODULE_DESCRIPTION("Spitz Keyboard Driver");
-MODULE_LICENSE("GPLv2");
+MODULE_LICENSE("GPL v2");
 MODULE_ALIAS("platform:spitz-keyboard");