arm: dts: imx7: colibri: add usdhci peripherals to device tree

[oweals/u-boot.git] / common / usb_kbd.c

diff --git a/common/usb_kbd.c b/common/usb_kbd.c
index 406bd37e6a7f31639d852163f8969b1c098b0a38..020f0d4117f7d07f1b22debe8e78b1c78f3f2f64 100644 (file)
--- a/common/usb_kbd.c
+++ b/common/usb_kbd.c
@@ -368,7 +368,7 @@ static int usb_kbd_testc(struct stdio_dev *sdev)
                return 0;
        kbd_testc_tms = get_timer(0);
 #endif
-       dev = stdio_get_by_name(DEVNAME);
+       dev = stdio_get_by_name(sdev->name);
        usb_kbd_dev = (struct usb_device *)dev->priv;
        data = usb_kbd_dev->privptr;
 
@@ -384,7 +384,7 @@ static int usb_kbd_getc(struct stdio_dev *sdev)
        struct usb_device *usb_kbd_dev;
        struct usb_kbd_pdata *data;
 
-       dev = stdio_get_by_name(DEVNAME);
+       dev = stdio_get_by_name(sdev->name);
        usb_kbd_dev = (struct usb_device *)dev->priv;
        data = usb_kbd_dev->privptr;
 
@@ -539,7 +539,7 @@ static int probe_usb_keyboard(struct usb_device *dev)
        return 0;
 }
 
-#ifndef CONFIG_DM_USB
+#if !CONFIG_IS_ENABLED(DM_USB)
 /* Search for keyboard and register it if found. */
 int drv_usb_kbd_init(void)
 {
@@ -602,7 +602,7 @@ int usb_kbd_deregister(int force)
 
 #endif
 
-#ifdef CONFIG_DM_USB
+#if CONFIG_IS_ENABLED(DM_USB)
 
 static int usb_kbd_probe(struct udevice *dev)
 {