Merge git://git.denx.de/u-boot-fsl-qoriq

[u-boot] / common / usb_kbd.c

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 9617a4848ad3b0d2dd3fd82d787403ccb6287b4b..97f79f8eb8c10a966b9b267d9f964ebff60102fd 100644 (file)
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -199,7 +199,7 @@ static int usb_kbd_translate(struct usb_kbd_pdata *data, unsigned char scancode,
                }
        }
 
-       if ((scancode > 0x1d) && (scancode < 0x3a)) {
+       if ((scancode > 0x1d) && (scancode < 0x39)) {
                /* Shift pressed */
                if (modifier & (LEFT_SHIFT | RIGHT_SHIFT))
                        keycode = usb_kbd_numkey_shifted[scancode - 0x1e];
@@ -566,7 +566,6 @@ int drv_usb_kbd_init(void)
        /* No USB Keyboard found */
        return -1;
 }
-#endif
 
 /* Deregister the keyboard. */
 int usb_kbd_deregister(int force)
@@ -599,6 +598,8 @@ int usb_kbd_deregister(int force)
 #endif
 }
 
+#endif
+
 #ifdef CONFIG_DM_USB
 
 static int usb_kbd_probe(struct udevice *dev)
@@ -611,6 +612,41 @@ static int usb_kbd_probe(struct udevice *dev)
        return ret;
 }
 
+static int usb_kbd_remove(struct udevice *dev)
+{
+       struct usb_device *udev = dev_get_parent_priv(dev);
+       struct usb_kbd_pdata *data;
+       struct stdio_dev *sdev;
+       int ret;
+
+       sdev = stdio_get_by_name(DEVNAME);
+       if (!sdev) {
+               ret = -ENXIO;
+               goto err;
+       }
+       data = udev->privptr;
+       if (stdio_deregister_dev(sdev, true)) {
+               ret = -EPERM;
+               goto err;
+       }
+#ifdef CONFIG_CONSOLE_MUX
+       if (iomux_doenv(stdin, getenv("stdin"))) {
+               ret = -ENOLINK;
+               goto err;
+       }
+#endif
+#ifdef CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE
+       destroy_int_queue(udev, data->intq);
+#endif
+       free(data->new);
+       free(data);
+
+       return 0;
+err:
+       printf("%s: warning, ret=%d", __func__, ret);
+       return ret;
+}
+
 static const struct udevice_id usb_kbd_ids[] = {
        { .compatible = "usb-keyboard" },
        { }
@@ -621,6 +657,7 @@ U_BOOT_DRIVER(usb_kbd) = {
        .id     = UCLASS_KEYBOARD,
        .of_match = usb_kbd_ids,
        .probe = usb_kbd_probe,
+       .remove = usb_kbd_remove,
 };
 
 static const struct usb_device_id kbd_id_table[] = {