diff options
author | Tom Rini <trini@konsulko.com> | 2018-11-27 14:01:45 -0500 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2018-11-27 14:01:45 -0500 |
commit | 67cf22cbdef8c62ffa28b4caf935825fe410c68d (patch) | |
tree | 57659ce202ce5f782442db271e67bd8e3ce409ba /drivers/usb/host/xhci-mem.c | |
parent | 5d5833af64bbafb308b3a2415e3186def678861b (diff) | |
parent | 1af9bfd334a5c92cb3123be7c8da3ba0f522cf4a (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Introduce CONFIG_SPL_DM_USB
Diffstat (limited to 'drivers/usb/host/xhci-mem.c')
-rw-r--r-- | drivers/usb/host/xhci-mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index da5dbd94ed..04ab540695 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c @@ -723,7 +723,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl, int slot_id = udev->slot_id; int speed = udev->speed; int route = 0; -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) struct usb_device *dev = udev; struct usb_hub_device *hub; #endif @@ -739,7 +739,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl, /* Only the control endpoint is valid - one endpoint context */ slot_ctx->dev_info |= cpu_to_le32(LAST_CTX(1)); -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) /* Calculate the route string for this device */ port_num = dev->portnr; while (!usb_hub_is_root_hub(dev->dev)) { @@ -782,7 +782,7 @@ void xhci_setup_addressable_virt_dev(struct xhci_ctrl *ctrl, BUG(); } -#ifdef CONFIG_DM_USB +#if CONFIG_IS_ENABLED(DM_USB) /* Set up TT fields to support FS/LS devices */ if (speed == USB_SPEED_LOW || speed == USB_SPEED_FULL) { struct udevice *parent = udev->dev; |