diff mbox series

Aw: Re: Re: Re: [ANN] U-Boot v2020.07-rc1 released

Message ID trinity-27d5f2fe-b699-4672-a88a-2dc8f4567ea4-1588355332928@3c-app-gmx-bs43
State New
Headers show
Series Aw: Re: Re: Re: [ANN] U-Boot v2020.07-rc1 released | expand

Commit Message

Frank Wunderlich May 1, 2020, 5:48 p.m. UTC
> >> 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"

Comments

Marek Vasut May 1, 2020, 6:08 p.m. UTC | #1
On 5/1/20 7:48 PM, Frank Wunderlich wrote:
>>>> 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);
>  }

It's a build failure, build it for versal_virt and see if the error is
gone. Is it ?
Frank Wunderlich May 1, 2020, 6:12 p.m. UTC | #2
> Gesendet: Freitag, 01. Mai 2020 um 20:08 Uhr
> Von: "Marek Vasut" <marex at denx.de>
> It's a build failure, build it for versal_virt and see if the error is
> gone. Is it ?

right, i reproduced it by these commands:

ARCH=arm64 make xilinx_versal_virt_defconfig
CROSS_COMPILE=aarch64-linux-gnu- make

and this build-error is gone in my tree
Marek Vasut May 1, 2020, 6:20 p.m. UTC | #3
On 5/1/20 8:12 PM, Frank Wunderlich wrote:
>> Gesendet: Freitag, 01. Mai 2020 um 20:08 Uhr
>> Von: "Marek Vasut" <marex at denx.de>
>> It's a build failure, build it for versal_virt and see if the error is
>> gone. Is it ?
> 
> right, i reproduced it by these commands:
> 
> ARCH=arm64 make xilinx_versal_virt_defconfig
> CROSS_COMPILE=aarch64-linux-gnu- make
> 
> and this build-error is gone in my tree

Cool, then send V5 of the series, thanks.
diff mbox series

Patch

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);
 }