diff options
| author | Samuel Holland <samuel@sholland.org> | 2021-07-05 13:29:02 +0100 |
|---|---|---|
| committer | Ramon Fried <rfried.dev@gmail.com> | 2021-09-28 18:50:55 +0300 |
| commit | a0a5c43193f62d427a7bd0b6b01fb5afbd8917e0 (patch) | |
| tree | 58c96a0df7f0e107faaf04c68c9ac84fe981d1ec /include | |
| parent | a814dbe7229681ed4ecb248fa3892b1882dcceac (diff) | |
| download | u-boot-a0a5c43193f62d427a7bd0b6b01fb5afbd8917e0.zip u-boot-a0a5c43193f62d427a7bd0b6b01fb5afbd8917e0.tar.gz u-boot-a0a5c43193f62d427a7bd0b6b01fb5afbd8917e0.tar.bz2 | |
usb: xhci-pci: Move reset logic out of XHCI core
Resetting an XHCI controller inside xhci_register undoes any register
setup performed by the platform driver. And at least on the Allwinner
H6, resetting the XHCI controller also resets the PHY, which prevents
the controller from working. That means the controller must be taken out
of reset before initializing the PHY, which must be done before calling
xhci_register.
The logic in the XHCI core was added to support the Raspberry Pi 4
(although this was not mentioned in the commit log!), which uses the
xhci-pci platform driver. Move the reset logic to the platform driver,
where it belongs, and where it cannot interfere with other platform
drivers.
This also fixes a failure to call reset_free if xhci_register failed.
Fixes: 0b80371b350e ("usb: xhci: Add reset controller support")
Signed-off-by: Samuel Holland <samuel@sholland.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/usb/xhci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/usb/xhci.h b/include/usb/xhci.h index 8d95e21..01e63cf 100644 --- a/include/usb/xhci.h +++ b/include/usb/xhci.h @@ -17,7 +17,6 @@ #define HOST_XHCI_H_ #include <phys2bus.h> -#include <reset.h> #include <asm/types.h> #include <asm/cache.h> #include <asm/io.h> @@ -1200,7 +1199,6 @@ struct xhci_ctrl { #if CONFIG_IS_ENABLED(DM_USB) struct udevice *dev; #endif - struct reset_ctl reset; struct xhci_hccr *hccr; /* R/O registers, not need for volatile */ struct xhci_hcor *hcor; struct xhci_doorbell_array *dba; |