From patchwork Fri May  1 17:48:52 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Frank Wunderlich <frank-w@public-files.de>
X-Patchwork-Id: 244754
List-Id: U-Boot discussion <u-boot.lists.denx.de>
From: frank-w at public-files.de (Frank Wunderlich)
Date: Fri, 1 May 2020 19:48:52 +0200
Subject: Aw: Re:  Re: Re: [ANN] U-Boot v2020.07-rc1 released
In-Reply-To: <11e52031-b153-45cc-3d9b-0cb26404dfc3@denx.de>
References: <20200429124905.GK4468@bill-the-cat>
 <0E76C0FC-D0CB-401D-8613-A3883DED6650@public-files.de>
 <20200430221847.GD4468@bill-the-cat>
 <b369200d-a5b1-0e85-44d0-45647f4f1a2d@denx.de>
 <trinity-cfc21f09-924a-476c-89f3-7dc67e23e8e5-1588340989445@3c-app-gmx-bs43>
 <12b78b70-f7e1-8cce-82c1-56982b79f32b@denx.de>
 <3cd8e196-5647-793a-3791-0a56d5fef0ac@denx.de>
 <trinity-f99f05bf-8316-4b65-972c-574c9720b5e5-1588347986849@3c-app-gmx-bs43>
 <11e52031-b153-45cc-3d9b-0cb26404dfc3@denx.de>
Message-ID: <trinity-27d5f2fe-b699-4672-a88a-2dc8f4567ea4-1588355332928@3c-app-gmx-bs43>

> >> Gesendet: Freitag, 01. Mai 2020 um 17:39 Uhr
> >> Von: "Marek Vasut" <marex at denx.de>
> >> Build failed, please fix:
> >> https://gitlab.denx.de/u-boot/custodians/u-boot-usb/pipelines/3054

could you try if all tests passing after this Patch?

regards Frank

commit 9c4a3633e92dbcd51aa60ff14693adc900e3c816
Author: Frank Wunderlich <frank-w at public-files.de>
Date:   Fri May 1 19:32:12 2020 +0200

    fix build-error for xilinx-board caused by xhci-Patches

    Fixes: "usb: dwc3: use the phy bulk API to get phys"

diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
index 9fcfa39d4b..563db1a426 100644
--- a/drivers/usb/host/xhci-dwc3.c
+++ b/drivers/usb/host/xhci-dwc3.c
@@ -19,8 +19,7 @@
 #include <linux/usb/otg.h>

 struct xhci_dwc3_platdata {
-       struct phy *usb_phys;
-       int num_phys;
+       struct phy_bulk *usb_phys;
 };

 void dwc3_set_mode(struct dwc3 *dwc3_reg, u32 mode)
@@ -125,7 +124,7 @@ static int xhci_dwc3_probe(struct udevice *dev)
        hcor = (struct xhci_hcor *)((uintptr_t)hccr +
                        HC_LENGTH(xhci_readl(&(hccr)->cr_capbase)));

-       ret = dwc3_setup_phy(dev, &plat->usb_phys, &plat->num_phys);
+       ret = dwc3_setup_phy(dev, plat->usb_phys);
        if (ret && (ret != -ENOTSUPP))
                return ret;

@@ -168,7 +167,7 @@ static int xhci_dwc3_remove(struct udevice *dev)
 {
        struct xhci_dwc3_platdata *plat = dev_get_platdata(dev);

-       dwc3_shutdown_phy(dev, plat->usb_phys, plat->num_phys);
+       dwc3_shutdown_phy(dev, plat->usb_phys);

        return xhci_deregister(dev);
 }