diff options
| author | Tom Rini <trini@konsulko.com> | 2024-02-20 08:03:21 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2024-02-20 08:03:21 -0500 |
| commit | 1817afe30f1549d4d2145bd35de0427e9a7bfdfb (patch) | |
| tree | 538d12902f6a16084a5bd33335ce3f454c54a939 | |
| parent | bebf916f9eb13aaf5bbf83fbd33204df5c6c9f8e (diff) | |
| parent | d9a20fea2ba53db3a999827d3e50e181d5513e09 (diff) | |
| download | u-boot-1817afe30f1549d4d2145bd35de0427e9a7bfdfb.zip u-boot-1817afe30f1549d4d2145bd35de0427e9a7bfdfb.tar.gz u-boot-1817afe30f1549d4d2145bd35de0427e9a7bfdfb.tar.bz2 | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-usb
| -rw-r--r-- | common/usb_hub.c | 6 | ||||
| -rw-r--r-- | drivers/usb/host/Kconfig | 6 | ||||
| -rw-r--r-- | drivers/usb/host/ehci-mx6.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/common/usb_hub.c b/common/usb_hub.c index 3fb7e14..2e054eb 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -174,8 +174,10 @@ static void usb_hub_power_on(struct usb_hub_device *hub) debug("enabling power on all ports\n"); for (i = 0; i < dev->maxchild; i++) { - usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_RESET); - debug("Reset : port %d returns %lX\n", i + 1, dev->status); + if (usb_hub_is_superspeed(dev)) { + usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_RESET); + debug("Reset : port %d returns %lX\n", i + 1, dev->status); + } usb_set_port_feature(dev, i + 1, USB_PORT_FEAT_POWER); debug("PowerOn : port %d returns %lX\n", i + 1, dev->status); } diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 0dd5736..f96027d 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -210,10 +210,10 @@ config USB_EHCI_MX6 config USB_EHCI_MX7 bool "Support for i.MX7 on-chip EHCI USB controller" - depends on ARCH_MX7 || IMX8M + depends on ARCH_MX7 || IMX8M || IMX93 select EHCI_HCD_INIT_AFTER_RESET if ARCH_MX7 - select PHY if IMX8M - select NOP_PHY if IMX8M + select PHY if IMX8M || IMX93 + select NOP_PHY if IMX8M || IMX93 default y ---help--- Enables support for the on-chip EHCI controller on i.MX7 SoCs. diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index a9ed5e7..a35fcca 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -538,7 +538,7 @@ static int ehci_usb_phy_mode(struct udevice *dev) plat->init_type = USB_INIT_DEVICE; else plat->init_type = USB_INIT_HOST; - } else if (is_mx7() || is_imx8mm() || is_imx8mn()) { + } else if (is_mx7() || is_imx8mm() || is_imx8mn() || is_imx93()) { phy_status = (void __iomem *)(addr + USBNC_PHY_STATUS_OFFSET); val = readl(phy_status); |