Merge branch 'pandora-27-omap1' into rev2

diff --git a/arch/arm/mach-omap2/board-omap3pandora-input.c b/arch/arm/mach-omap2/board-omap3pandora-input.c
index 76cdf1e..c343efb 100644 (file)
--- a/arch/arm/mach-omap2/board-omap3pandora-input.c
+++ b/arch/arm/mach-omap2/board-omap3pandora-input.c
@@ -110,25 +110,25 @@ static struct gpio_keys_button gpio_buttons[] = {
                .active_low             = 1,
                .desc                   = "dpad right",
        }, {
-               .code                   = BTN_A,
+               .code                   = KEY_KP2,
                .gpio                   = 111,
                .active_low             = 1,
-               .desc                   = "a",
+               .desc                   = "game 2",
        }, {
-               .code                   = BTN_B,
+               .code                   = KEY_KP3,
                .gpio                   = 106,
                .active_low             = 1,
-               .desc                   = "b",
+               .desc                   = "game 3",
        }, {
-               .code                   = BTN_X,
+               .code                   = KEY_KP1,
                .gpio                   = 109,
                .active_low             = 1,
-               .desc                   = "x",
+               .desc                   = "game 1",
        }, {
-               .code                   = BTN_Y,
+               .code                   = KEY_KP4,
                .gpio                   = 101,
                .active_low             = 1,
-               .desc                   = "y",
+               .desc                   = "game 4",
        }, {
                .code                   = BTN_TL,
                .gpio                   = 102,

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 36b0e00..1abf971 100644 (file)
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -77,6 +77,10 @@ static const struct {
        __u16 from;
        __u16 to;
 } converted_keys[] = {
+       { KEY_KP1,      BTN_0 },
+       { KEY_KP2,      BTN_1 },
+       { KEY_KP3,      BTN_2 },
+       { KEY_KP4,      BTN_3 },
        { KEY_LEFTCTRL, BTN_SELECT },
        { KEY_LEFTALT,  BTN_START },
        { KEY_MENU,     BTN_MODE },
@@ -780,6 +784,13 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
                        joydev->nabs++;
                }
 
+       for (i = 0; i < ARRAY_SIZE(converted_keys); i++)
+               if (test_bit(converted_keys[i].from, dev->keybit)) {
+                       joydev->keymap[converted_keys[i].to - BTN_MISC] = joydev->nkey;
+                       joydev->keypam[joydev->nkey] = converted_keys[i].to;
+                       joydev->nkey++;
+               }
+
        for (i = BTN_JOYSTICK - BTN_MISC; i < KEY_MAX - BTN_MISC + 1; i++)
                if (test_bit(i + BTN_MISC, dev->keybit)) {
                        joydev->keymap[i] = joydev->nkey;
@@ -794,13 +805,6 @@ static int joydev_connect(struct input_handler *handler, struct input_dev *dev,
                        joydev->nkey++;
                }
 
-       for (i = 0; i < ARRAY_SIZE(converted_keys); i++)
-               if (test_bit(converted_keys[i].from, dev->keybit)) {
-                       joydev->keymap[converted_keys[i].to - BTN_MISC] = joydev->nkey;
-                       joydev->keypam[joydev->nkey] = converted_keys[i].to;
-                       joydev->nkey++;
-               }
-
        for (i = 0; i < joydev->nabs; i++) {
                j = joydev->abspam[i];
                if (dev->absmax[j] == dev->absmin[j]) {