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 X-Patchwork-Id: 1281407 X-Patchwork-Delegate: marek.vasut@gmail.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=public-files.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.a=rsa-sha256 header.s=badeba3b8450 header.b=LepIad+Z; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49DKWC4LRHz9sTJ for ; Sat, 2 May 2020 03:49:11 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id EF3028228A; Fri, 1 May 2020 19:49:04 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=public-files.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; secure) header.d=gmx.net header.i=@gmx.net header.b="LepIad+Z"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5C77182292; Fri, 1 May 2020 19:49:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from mout.gmx.net (mout.gmx.net [212.227.15.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4AD2C8228A for ; Fri, 1 May 2020 19:48:59 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=public-files.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=frank-w@public-files.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1588355333; bh=+3HFNXaxyAyqHj1Ah1yQRVh5ZqsnXi904VogQ23pPpo=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=LepIad+ZGAOEA+qp33NSO6cAMDlvq315yJ2znsZgtZll0DmcrjeCGesP6QP6PNjf0 kuWEqeAJDzeZQptkm6nPPkJk70ZEFV4FoVDhUvGyFnRgxBtA2AJTAiEAfUoBOeoj76 iuqFnStubIzkcpChelUNHhZySiANMafHbMwGi6+Y= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [80.208.215.219] ([80.208.215.219]) by web-mail.gmx.net (3c-app-gmx-bs43.server.lan [172.19.170.95]) (via HTTP); Fri, 1 May 2020 19:48:52 +0200 MIME-Version: 1.0 Message-ID: From: "Frank Wunderlich" To: "Marek Vasut" Cc: "Chunfeng Yun" , "Tom Rini" , u-boot@lists.denx.de Subject: Aw: Re: Re: Re: [ANN] U-Boot v2020.07-rc1 released Date: Fri, 1 May 2020 19:48:52 +0200 Importance: normal Sensitivity: Normal 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> <12b78b70-f7e1-8cce-82c1-56982b79f32b@denx.de> <3cd8e196-5647-793a-3791-0a56d5fef0ac@denx.de> <11e52031-b153-45cc-3d9b-0cb26404dfc3@denx.de> X-UI-Message-Type: mail X-Priority: 3 X-Provags-ID: V03:K1:YD26hDPXgpkUfxBPQrhvUdHgJ7NmawOE0gWReDB1VUjYtHdnlFn4nbfhVCDd2UbBe59JH p1OEEZWbqBBWUtYjzywi2j5s61wwK9+4U7fnwe6SU0a6W2H/2caVs5H9FcgUWwP0iFp3iwsCoM9C g7hSmhcahWKGLkyki7mHn4PYI7UCUyP3ACblta5+YuBWKL5nl1NB2Twr1rFL6uOVmM+sQK5lbOeV b3/X8xojhwOQkZdbFkscjFxINy1CJRV73RhQ6fyKjo4eGg7Gd689CgdmJCBceM+w5o0Q2ll3jy3l 4k= X-UI-Out-Filterresults: notjunk:1;V03:K0:eXVShCRXna0=:lVTG/NoSAsrbsUzxrIhOim BqCorGkZEL+HdfoO536ixqSnLJYLFkijMDpS2reH8ttB6HHG5Z9+yQvw0CSCCcv4HYFItn2K5 Zpuala05ZNTUJ3SqhPzPLxfKuSq4sfpMz8gztWQViqHdPY9RUnr4kFnu3PfvTQs62oSBKEc9K fM/52kXroipDThzcLEWdGGgEu3xU7+GzooD7QYxRezm5U3VjqNC9JvndmfvM1fVWdcbhdP1AY oTb2NlufwZ/wHIgoJLDVhi0s6BXN0KLh2wpiSDSAhDB0nQK4UEsb+UWVhoTGLr6l1FqusCoWS 2rrwKK0gtUo1bxzJL9SufeOWvfaYaJOlH05lfImJ+L/s7t7z6gmCqlBIfRjE3VEWbPSfiT5AY fiOCeCvkDIZwaBlfgR5Nu7MSXoZJcUrv+yW+AfRbGo+v5NgEn+3RE1M5ZQApnkOlITayJcWpF sqaIjQp1dkeP2wcYwWaJuNA+/TJnbowXGVZD2o/9DbD34b8TjqdtPE4tekgXByTSUyUw1Rdle Za1PeiNBsIeEZ7Qoj/+gcsByPJMWXs2m/wAZjDX5O+huXM33CCm9J67iSOQeqIpeAUdVXW3No KdaQiOc9vnbSs8MyA3ujfK+yDDoOJ2IyCnd5D5ebnlruK2u9SUDjkU4XgJQrfkJFciviyq9VS ANUQPajPRympmTNvAtgbHSWy1AYTIfbC7wUK4MD9g1Hi0nHx2GJiWjIhm35yA75uib5k= X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean > >> Gesendet: Freitag, 01. Mai 2020 um 17:39 Uhr > >> Von: "Marek Vasut" > >> 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 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 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); }