Adapt the xhci dwc3 and exynos5 glue and the cdns3 ep0 code to the new API.
Co-developed-by: Jerome Forissier <[email protected]> Signed-off-by: Jerome Forissier <[email protected]> Co-developed-by: Jens Wiklander <[email protected]> Signed-off-by: Jens Wiklander <[email protected]> Signed-off-by: Anders Roxell <[email protected]> --- drivers/usb/cdns3/ep0.c | 8 ++++---- drivers/usb/host/xhci-dwc3.c | 4 ++-- drivers/usb/host/xhci-exynos5.c | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/usb/cdns3/ep0.c b/drivers/usb/cdns3/ep0.c index acff79ae1ca1..40282cbc3234 100644 --- a/drivers/usb/cdns3/ep0.c +++ b/drivers/usb/cdns3/ep0.c @@ -341,10 +341,10 @@ static int cdns3_ep0_feature_handle_device(struct cdns3_device *priv_dev, return -EINVAL; switch (tmode >> 8) { - case TEST_J: - case TEST_K: - case TEST_SE0_NAK: - case TEST_PACKET: + case USB_TEST_J: + case USB_TEST_K: + case USB_TEST_SE0_NAK: + case USB_TEST_PACKET: cdns3_ep0_complete_setup(priv_dev, 0, 1); /** * Little delay to give the controller some time diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c index 8ad07a4b98c9..1b2fa569ab01 100644 --- a/drivers/usb/host/xhci-dwc3.c +++ b/drivers/usb/host/xhci-dwc3.c @@ -51,7 +51,7 @@ static void dwc3_phy_reset(struct dwc3 *dwc3_reg) clrbits_le32(&dwc3_reg->g_usb2phycfg, DWC3_GUSB2PHYCFG_PHYSOFTRST); } -void dwc3_core_soft_reset(struct dwc3 *dwc3_reg) +static void _dwc3_core_soft_reset(struct dwc3 *dwc3_reg) { /* Before Resetting PHY, put Core in Reset */ setbits_le32(&dwc3_reg->g_ctl, DWC3_GCTL_CORESOFTRESET); @@ -79,7 +79,7 @@ int dwc3_core_init(struct dwc3 *dwc3_reg) return -1; } - dwc3_core_soft_reset(dwc3_reg); + _dwc3_core_soft_reset(dwc3_reg); dwc3_hwparams1 = readl(&dwc3_reg->g_hwparams1); diff --git a/drivers/usb/host/xhci-exynos5.c b/drivers/usb/host/xhci-exynos5.c index 500696ccae71..10c38af675cd 100644 --- a/drivers/usb/host/xhci-exynos5.c +++ b/drivers/usb/host/xhci-exynos5.c @@ -91,7 +91,7 @@ static int xhci_usb_of_to_plat(struct udevice *dev) return 0; } -static void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy) +void exynos5_usb3_phy_init(struct exynos_usb3_phy *phy) { u32 reg; -- 2.53.0
