From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7C90C0044C for ; Mon, 5 Nov 2018 09:20:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8E2D020862 for ; Mon, 5 Nov 2018 09:20:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E2D020862 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=ucw.cz Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729370AbeKESis (ORCPT ); Mon, 5 Nov 2018 13:38:48 -0500 Received: from atrey.karlin.mff.cuni.cz ([195.113.26.193]:46160 "EHLO atrey.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726086AbeKESir (ORCPT ); Mon, 5 Nov 2018 13:38:47 -0500 Received: by atrey.karlin.mff.cuni.cz (Postfix, from userid 512) id 8365780805; Mon, 5 Nov 2018 10:19:58 +0100 (CET) Date: Mon, 5 Nov 2018 10:20:00 +0100 From: Pavel Machek To: Lubomir Rintel Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Rob Herring , Mark Rutland , Greg Kroah-Hartman , Eric Miao , Haojian Zhuang , Kishon Vijay Abraham I , Alan Stern Subject: Re: [PATCH 10/14] USB: gadget: mv-udc: use phy-pxa-usb Message-ID: <20181105092000.GJ4439@amd> References: <20180822204307.13251-1-lkundrak@v3.sk> <20180822204307.13251-11-lkundrak@v3.sk> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="ZG+WKzXzVby2T9Ro" Content-Disposition: inline In-Reply-To: <20180822204307.13251-11-lkundrak@v3.sk> User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --ZG+WKzXzVby2T9Ro Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed 2018-08-22 22:43:03, Lubomir Rintel wrote: > Use a proper PHY driver, instead of hooks to a board support package. >=20 > Signed-off-by: Lubomir Rintel Acked-by: Pavel Machek > --- > arch/arm/mach-mmp/devices.c | 11 +------- > drivers/usb/gadget/udc/mv_udc.h | 7 ++++- > drivers/usb/gadget/udc/mv_udc_core.c | 38 ++++++++-------------------- > 3 files changed, 17 insertions(+), 39 deletions(-) >=20 > diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c > index eb9b3c34e90a..d925be9f14a9 100644 > --- a/arch/arm/mach-mmp/devices.c > +++ b/arch/arm/mach-mmp/devices.c > @@ -263,21 +263,12 @@ struct platform_device pxa168_device_usb_phy =3D { > =20 > #if IS_ENABLED(CONFIG_USB_MV_UDC) > struct resource pxa168_u2o_resources[] =3D { > - /* regbase */ > [0] =3D { > - .start =3D PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET, > + .start =3D PXA168_U2O_REGBASE, > .end =3D PXA168_U2O_REGBASE + USB_REG_RANGE, > .flags =3D IORESOURCE_MEM, > - .name =3D "capregs", > }, > - /* phybase */ > [1] =3D { > - .start =3D PXA168_U2O_PHYBASE, > - .end =3D PXA168_U2O_PHYBASE + USB_PHY_RANGE, > - .flags =3D IORESOURCE_MEM, > - .name =3D "phyregs", > - }, > - [2] =3D { > .start =3D IRQ_PXA168_USB1, > .end =3D IRQ_PXA168_USB1, > .flags =3D IORESOURCE_IRQ, > diff --git a/drivers/usb/gadget/udc/mv_udc.h b/drivers/usb/gadget/udc/mv_= udc.h > index b3f759c0962c..6f04f432964d 100644 > --- a/drivers/usb/gadget/udc/mv_udc.h > +++ b/drivers/usb/gadget/udc/mv_udc.h > @@ -6,6 +6,9 @@ > #ifndef __MV_UDC_H > #define __MV_UDC_H > =20 > +/* registers */ > +#define U2x_CAPREGS_OFFSET 0x100 > + > #define VUSBHS_MAX_PORTS 8 > =20 > #define DQH_ALIGNMENT 2048 > @@ -174,9 +177,9 @@ struct mv_udc { > struct platform_device *dev; > int irq; > =20 > + void __iomem *base; > struct mv_cap_regs __iomem *cap_regs; > struct mv_op_regs __iomem *op_regs; > - void __iomem *phy_regs; > unsigned int max_eps; > struct mv_dqh *ep_dqh; > size_t ep_dqh_size; > @@ -219,6 +222,8 @@ struct mv_udc { > =20 > /* some SOC has mutiple clock sources for USB*/ > struct clk *clk; > + > + struct phy *phy; > }; > =20 > /* endpoint data structure */ > diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/ud= c/mv_udc_core.c > index 95f52232493b..c701c83d3af5 100644 > --- a/drivers/usb/gadget/udc/mv_udc_core.c > +++ b/drivers/usb/gadget/udc/mv_udc_core.c > @@ -1069,14 +1069,11 @@ static int mv_udc_enable_internal(struct mv_udc *= udc) > if (retval) > return retval; > =20 > - if (udc->pdata->phy_init) { > - retval =3D udc->pdata->phy_init(udc->phy_regs); > - if (retval) { > - dev_err(&udc->dev->dev, > - "init phy error %d\n", retval); > - udc_clock_disable(udc); > - return retval; > - } > + retval =3D phy_init(udc->phy); > + if (retval) { > + dev_err(&udc->dev->dev, "init phy error %d\n", retval); > + udc_clock_disable(udc); > + return retval; > } > udc->active =3D 1; > =20 > @@ -1095,8 +1092,7 @@ static void mv_udc_disable_internal(struct mv_udc *= udc) > { > if (udc->active) { > dev_dbg(&udc->dev->dev, "disable udc\n"); > - if (udc->pdata->phy_deinit) > - udc->pdata->phy_deinit(udc->phy_regs); > + phy_exit(udc->phy); > udc_clock_disable(udc); > udc->active =3D 0; > } > @@ -2147,30 +2143,16 @@ static int mv_udc_probe(struct platform_device *p= dev) > if (IS_ERR(udc->clk)) > return PTR_ERR(udc->clk); > =20 > - r =3D platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "capregs"); > + r =3D platform_get_resource(udc->dev, IORESOURCE_MEM, 0); > if (r =3D=3D NULL) { > dev_err(&pdev->dev, "no I/O memory resource defined\n"); > return -ENODEV; > } > =20 > - udc->cap_regs =3D (struct mv_cap_regs __iomem *) > - devm_ioremap(&pdev->dev, r->start, resource_size(r)); > - if (udc->cap_regs =3D=3D NULL) { > - dev_err(&pdev->dev, "failed to map I/O memory\n"); > - return -EBUSY; > - } > - > - r =3D platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "phyregs"); > - if (r =3D=3D NULL) { > - dev_err(&pdev->dev, "no phy I/O memory resource defined\n"); > - return -ENODEV; > - } > + udc->base =3D devm_ioremap(&pdev->dev, r->start, resource_size(r)); > =20 > - udc->phy_regs =3D devm_ioremap(&pdev->dev, r->start, resource_size(r)); > - if (udc->phy_regs =3D=3D NULL) { > - dev_err(&pdev->dev, "failed to map phy I/O memory\n"); > - return -EBUSY; > - } > + udc->cap_regs =3D > + (void __iomem *) ((unsigned long)udc->base + U2x_CAPREGS_OFFSET); > =20 > /* we will acces controller register, so enable the clk */ > retval =3D mv_udc_enable_internal(udc); --=20 (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blo= g.html --ZG+WKzXzVby2T9Ro Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlvgC0AACgkQMOfwapXb+vIRDQCfU1xerhnJD27kdw+JOaEQUdVB MxgAn1kBpH9+c+mF9cSVDbmW8uDK0of0 =UJt7 -----END PGP SIGNATURE----- --ZG+WKzXzVby2T9Ro-- From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [10/14] USB: gadget: mv-udc: use phy-pxa-usb From: Pavel Machek Message-Id: <20181105092000.GJ4439@amd> Date: Mon, 5 Nov 2018 10:20:00 +0100 To: Lubomir Rintel Cc: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Rob Herring , Mark Rutland , Greg Kroah-Hartman , Eric Miao , Haojian Zhuang , Kishon Vijay Abraham I , Alan Stern List-ID: T24gV2VkIDIwMTgtMDgtMjIgMjI6NDM6MDMsIEx1Ym9taXIgUmludGVsIHdyb3RlOgo+IFVzZSBh IHByb3BlciBQSFkgZHJpdmVyLCBpbnN0ZWFkIG9mIGhvb2tzIHRvIGEgYm9hcmQgc3VwcG9ydCBw YWNrYWdlLgo+IAo+IFNpZ25lZC1vZmYtYnk6IEx1Ym9taXIgUmludGVsIDxsa3VuZHJha0B2My5z az4KCkFja2VkLWJ5OiBQYXZlbCBNYWNoZWsgPHBhdmVsQHVjdy5jej4KCj4gLS0tCj4gIGFyY2gv YXJtL21hY2gtbW1wL2RldmljZXMuYyAgICAgICAgICB8IDExICstLS0tLS0tCj4gIGRyaXZlcnMv dXNiL2dhZGdldC91ZGMvbXZfdWRjLmggICAgICB8ICA3ICsrKystCj4gIGRyaXZlcnMvdXNiL2dh ZGdldC91ZGMvbXZfdWRjX2NvcmUuYyB8IDM4ICsrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0K PiAgMyBmaWxlcyBjaGFuZ2VkLCAxNyBpbnNlcnRpb25zKCspLCAzOSBkZWxldGlvbnMoLSkKPiAK PiBkaWZmIC0tZ2l0IGEvYXJjaC9hcm0vbWFjaC1tbXAvZGV2aWNlcy5jIGIvYXJjaC9hcm0vbWFj aC1tbXAvZGV2aWNlcy5jCj4gaW5kZXggZWI5YjNjMzRlOTBhLi5kOTI1YmU5ZjE0YTkgMTAwNjQ0 Cj4gLS0tIGEvYXJjaC9hcm0vbWFjaC1tbXAvZGV2aWNlcy5jCj4gKysrIGIvYXJjaC9hcm0vbWFj aC1tbXAvZGV2aWNlcy5jCj4gQEAgLTI2MywyMSArMjYzLDEyIEBAIHN0cnVjdCBwbGF0Zm9ybV9k ZXZpY2UgcHhhMTY4X2RldmljZV91c2JfcGh5ID0gewo+ICAKPiAgI2lmIElTX0VOQUJMRUQoQ09O RklHX1VTQl9NVl9VREMpCj4gIHN0cnVjdCByZXNvdXJjZSBweGExNjhfdTJvX3Jlc291cmNlc1td ID0gewo+IC0JLyogcmVnYmFzZSAqLwo+ICAJWzBdID0gewo+IC0JCS5zdGFydAk9IFBYQTE2OF9V Mk9fUkVHQkFTRSArIFUyeF9DQVBSRUdTX09GRlNFVCwKPiArCQkuc3RhcnQJPSBQWEExNjhfVTJP X1JFR0JBU0UsCj4gIAkJLmVuZAk9IFBYQTE2OF9VMk9fUkVHQkFTRSArIFVTQl9SRUdfUkFOR0Us Cj4gIAkJLmZsYWdzCT0gSU9SRVNPVVJDRV9NRU0sCj4gLQkJLm5hbWUJPSAiY2FwcmVncyIsCj4g IAl9LAo+IC0JLyogcGh5YmFzZSAqLwo+ICAJWzFdID0gewo+IC0JCS5zdGFydAk9IFBYQTE2OF9V Mk9fUEhZQkFTRSwKPiAtCQkuZW5kCT0gUFhBMTY4X1UyT19QSFlCQVNFICsgVVNCX1BIWV9SQU5H RSwKPiAtCQkuZmxhZ3MJPSBJT1JFU09VUkNFX01FTSwKPiAtCQkubmFtZQk9ICJwaHlyZWdzIiwK PiAtCX0sCj4gLQlbMl0gPSB7Cj4gIAkJLnN0YXJ0CT0gSVJRX1BYQTE2OF9VU0IxLAo+ICAJCS5l bmQJPSBJUlFfUFhBMTY4X1VTQjEsCj4gIAkJLmZsYWdzCT0gSU9SRVNPVVJDRV9JUlEsCj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2dhZGdldC91ZGMvbXZfdWRjLmggYi9kcml2ZXJzL3VzYi9n YWRnZXQvdWRjL212X3VkYy5oCj4gaW5kZXggYjNmNzU5YzA5NjJjLi42ZjA0ZjQzMjk2NGQgMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9tdl91ZGMuaAo+ICsrKyBiL2RyaXZl cnMvdXNiL2dhZGdldC91ZGMvbXZfdWRjLmgKPiBAQCAtNiw2ICs2LDkgQEAKPiAgI2lmbmRlZiBf X01WX1VEQ19ICj4gICNkZWZpbmUgX19NVl9VRENfSAo+ICAKPiArLyogcmVnaXN0ZXJzICovCj4g KyNkZWZpbmUgVTJ4X0NBUFJFR1NfT0ZGU0VUCTB4MTAwCj4gKwo+ICAjZGVmaW5lIFZVU0JIU19N QVhfUE9SVFMJOAo+ICAKPiAgI2RlZmluZSBEUUhfQUxJR05NRU5UCQkyMDQ4Cj4gQEAgLTE3NCw5 ICsxNzcsOSBAQCBzdHJ1Y3QgbXZfdWRjIHsKPiAgCXN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UJCSpk ZXY7Cj4gIAlpbnQJCQkJaXJxOwo+ICAKPiArCXZvaWQgX19pb21lbSAgICAgICAgICAgICAgICAg ICAgKmJhc2U7Cj4gIAlzdHJ1Y3QgbXZfY2FwX3JlZ3MgX19pb21lbQkqY2FwX3JlZ3M7Cj4gIAlz dHJ1Y3QgbXZfb3BfcmVncyBfX2lvbWVtCSpvcF9yZWdzOwo+IC0Jdm9pZCBfX2lvbWVtICAgICAg ICAgICAgICAgICAgICAqcGh5X3JlZ3M7Cj4gIAl1bnNpZ25lZCBpbnQJCQltYXhfZXBzOwo+ICAJ c3RydWN0IG12X2RxaAkJCSplcF9kcWg7Cj4gIAlzaXplX3QJCQkJZXBfZHFoX3NpemU7Cj4gQEAg LTIxOSw2ICsyMjIsOCBAQCBzdHJ1Y3QgbXZfdWRjIHsKPiAgCj4gIAkvKiBzb21lIFNPQyBoYXMg bXV0aXBsZSBjbG9jayBzb3VyY2VzIGZvciBVU0IqLwo+ICAJc3RydWN0IGNsayAgICAgICpjbGs7 Cj4gKwo+ICsJc3RydWN0IHBoeQkqcGh5Owo+ICB9Owo+ICAKPiAgLyogZW5kcG9pbnQgZGF0YSBz dHJ1Y3R1cmUgKi8KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9tdl91ZGNf Y29yZS5jIGIvZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9tdl91ZGNfY29yZS5jCj4gaW5kZXggOTVm NTIyMzI0OTNiLi5jNzAxYzgzZDNhZjUgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy91c2IvZ2FkZ2V0 L3VkYy9tdl91ZGNfY29yZS5jCj4gKysrIGIvZHJpdmVycy91c2IvZ2FkZ2V0L3VkYy9tdl91ZGNf Y29yZS5jCj4gQEAgLTEwNjksMTQgKzEwNjksMTEgQEAgc3RhdGljIGludCBtdl91ZGNfZW5hYmxl X2ludGVybmFsKHN0cnVjdCBtdl91ZGMgKnVkYykKPiAgCWlmIChyZXR2YWwpCj4gIAkJcmV0dXJu IHJldHZhbDsKPiAgCj4gLQlpZiAodWRjLT5wZGF0YS0+cGh5X2luaXQpIHsKPiAtCQlyZXR2YWwg PSB1ZGMtPnBkYXRhLT5waHlfaW5pdCh1ZGMtPnBoeV9yZWdzKTsKPiAtCQlpZiAocmV0dmFsKSB7 Cj4gLQkJCWRldl9lcnIoJnVkYy0+ZGV2LT5kZXYsCj4gLQkJCQkiaW5pdCBwaHkgZXJyb3IgJWRc biIsIHJldHZhbCk7Cj4gLQkJCXVkY19jbG9ja19kaXNhYmxlKHVkYyk7Cj4gLQkJCXJldHVybiBy ZXR2YWw7Cj4gLQkJfQo+ICsJcmV0dmFsID0gcGh5X2luaXQodWRjLT5waHkpOwo+ICsJaWYgKHJl dHZhbCkgewo+ICsJCWRldl9lcnIoJnVkYy0+ZGV2LT5kZXYsICJpbml0IHBoeSBlcnJvciAlZFxu IiwgcmV0dmFsKTsKPiArCQl1ZGNfY2xvY2tfZGlzYWJsZSh1ZGMpOwo+ICsJCXJldHVybiByZXR2 YWw7Cj4gIAl9Cj4gIAl1ZGMtPmFjdGl2ZSA9IDE7Cj4gIAo+IEBAIC0xMDk1LDggKzEwOTIsNyBA QCBzdGF0aWMgdm9pZCBtdl91ZGNfZGlzYWJsZV9pbnRlcm5hbChzdHJ1Y3QgbXZfdWRjICp1ZGMp Cj4gIHsKPiAgCWlmICh1ZGMtPmFjdGl2ZSkgewo+ICAJCWRldl9kYmcoJnVkYy0+ZGV2LT5kZXYs ICJkaXNhYmxlIHVkY1xuIik7Cj4gLQkJaWYgKHVkYy0+cGRhdGEtPnBoeV9kZWluaXQpCj4gLQkJ CXVkYy0+cGRhdGEtPnBoeV9kZWluaXQodWRjLT5waHlfcmVncyk7Cj4gKwkJcGh5X2V4aXQodWRj LT5waHkpOwo+ICAJCXVkY19jbG9ja19kaXNhYmxlKHVkYyk7Cj4gIAkJdWRjLT5hY3RpdmUgPSAw Owo+ICAJfQo+IEBAIC0yMTQ3LDMwICsyMTQzLDE2IEBAIHN0YXRpYyBpbnQgbXZfdWRjX3Byb2Jl KHN0cnVjdCBwbGF0Zm9ybV9kZXZpY2UgKnBkZXYpCj4gIAlpZiAoSVNfRVJSKHVkYy0+Y2xrKSkK PiAgCQlyZXR1cm4gUFRSX0VSUih1ZGMtPmNsayk7Cj4gIAo+IC0JciA9IHBsYXRmb3JtX2dldF9y ZXNvdXJjZV9ieW5hbWUodWRjLT5kZXYsIElPUkVTT1VSQ0VfTUVNLCAiY2FwcmVncyIpOwo+ICsJ ciA9IHBsYXRmb3JtX2dldF9yZXNvdXJjZSh1ZGMtPmRldiwgSU9SRVNPVVJDRV9NRU0sIDApOwo+ ICAJaWYgKHIgPT0gTlVMTCkgewo+ICAJCWRldl9lcnIoJnBkZXYtPmRldiwgIm5vIEkvTyBtZW1v cnkgcmVzb3VyY2UgZGVmaW5lZFxuIik7Cj4gIAkJcmV0dXJuIC1FTk9ERVY7Cj4gIAl9Cj4gIAo+ IC0JdWRjLT5jYXBfcmVncyA9IChzdHJ1Y3QgbXZfY2FwX3JlZ3MgX19pb21lbSAqKQo+IC0JCWRl dm1faW9yZW1hcCgmcGRldi0+ZGV2LCByLT5zdGFydCwgcmVzb3VyY2Vfc2l6ZShyKSk7Cj4gLQlp ZiAodWRjLT5jYXBfcmVncyA9PSBOVUxMKSB7Cj4gLQkJZGV2X2VycigmcGRldi0+ZGV2LCAiZmFp bGVkIHRvIG1hcCBJL08gbWVtb3J5XG4iKTsKPiAtCQlyZXR1cm4gLUVCVVNZOwo+IC0JfQo+IC0K PiAtCXIgPSBwbGF0Zm9ybV9nZXRfcmVzb3VyY2VfYnluYW1lKHVkYy0+ZGV2LCBJT1JFU09VUkNF X01FTSwgInBoeXJlZ3MiKTsKPiAtCWlmIChyID09IE5VTEwpIHsKPiAtCQlkZXZfZXJyKCZwZGV2 LT5kZXYsICJubyBwaHkgSS9PIG1lbW9yeSByZXNvdXJjZSBkZWZpbmVkXG4iKTsKPiAtCQlyZXR1 cm4gLUVOT0RFVjsKPiAtCX0KPiArCXVkYy0+YmFzZSA9IGRldm1faW9yZW1hcCgmcGRldi0+ZGV2 LCByLT5zdGFydCwgcmVzb3VyY2Vfc2l6ZShyKSk7Cj4gIAo+IC0JdWRjLT5waHlfcmVncyA9IGRl dm1faW9yZW1hcCgmcGRldi0+ZGV2LCByLT5zdGFydCwgcmVzb3VyY2Vfc2l6ZShyKSk7Cj4gLQlp ZiAodWRjLT5waHlfcmVncyA9PSBOVUxMKSB7Cj4gLQkJZGV2X2VycigmcGRldi0+ZGV2LCAiZmFp bGVkIHRvIG1hcCBwaHkgSS9PIG1lbW9yeVxuIik7Cj4gLQkJcmV0dXJuIC1FQlVTWTsKPiAtCX0K PiArCXVkYy0+Y2FwX3JlZ3MgPQo+ICsJCSh2b2lkIF9faW9tZW0gKikgKCh1bnNpZ25lZCBsb25n KXVkYy0+YmFzZSArIFUyeF9DQVBSRUdTX09GRlNFVCk7Cj4gIAo+ICAJLyogd2Ugd2lsbCBhY2Nl cyBjb250cm9sbGVyIHJlZ2lzdGVyLCBzbyBlbmFibGUgdGhlIGNsayAqLwo+ICAJcmV0dmFsID0g bXZfdWRjX2VuYWJsZV9pbnRlcm5hbCh1ZGMpOwo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: pavel@ucw.cz (Pavel Machek) Date: Mon, 5 Nov 2018 10:20:00 +0100 Subject: [PATCH 10/14] USB: gadget: mv-udc: use phy-pxa-usb In-Reply-To: <20180822204307.13251-11-lkundrak@v3.sk> References: <20180822204307.13251-1-lkundrak@v3.sk> <20180822204307.13251-11-lkundrak@v3.sk> Message-ID: <20181105092000.GJ4439@amd> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed 2018-08-22 22:43:03, Lubomir Rintel wrote: > Use a proper PHY driver, instead of hooks to a board support package. > > Signed-off-by: Lubomir Rintel Acked-by: Pavel Machek > --- > arch/arm/mach-mmp/devices.c | 11 +------- > drivers/usb/gadget/udc/mv_udc.h | 7 ++++- > drivers/usb/gadget/udc/mv_udc_core.c | 38 ++++++++-------------------- > 3 files changed, 17 insertions(+), 39 deletions(-) > > diff --git a/arch/arm/mach-mmp/devices.c b/arch/arm/mach-mmp/devices.c > index eb9b3c34e90a..d925be9f14a9 100644 > --- a/arch/arm/mach-mmp/devices.c > +++ b/arch/arm/mach-mmp/devices.c > @@ -263,21 +263,12 @@ struct platform_device pxa168_device_usb_phy = { > > #if IS_ENABLED(CONFIG_USB_MV_UDC) > struct resource pxa168_u2o_resources[] = { > - /* regbase */ > [0] = { > - .start = PXA168_U2O_REGBASE + U2x_CAPREGS_OFFSET, > + .start = PXA168_U2O_REGBASE, > .end = PXA168_U2O_REGBASE + USB_REG_RANGE, > .flags = IORESOURCE_MEM, > - .name = "capregs", > }, > - /* phybase */ > [1] = { > - .start = PXA168_U2O_PHYBASE, > - .end = PXA168_U2O_PHYBASE + USB_PHY_RANGE, > - .flags = IORESOURCE_MEM, > - .name = "phyregs", > - }, > - [2] = { > .start = IRQ_PXA168_USB1, > .end = IRQ_PXA168_USB1, > .flags = IORESOURCE_IRQ, > diff --git a/drivers/usb/gadget/udc/mv_udc.h b/drivers/usb/gadget/udc/mv_udc.h > index b3f759c0962c..6f04f432964d 100644 > --- a/drivers/usb/gadget/udc/mv_udc.h > +++ b/drivers/usb/gadget/udc/mv_udc.h > @@ -6,6 +6,9 @@ > #ifndef __MV_UDC_H > #define __MV_UDC_H > > +/* registers */ > +#define U2x_CAPREGS_OFFSET 0x100 > + > #define VUSBHS_MAX_PORTS 8 > > #define DQH_ALIGNMENT 2048 > @@ -174,9 +177,9 @@ struct mv_udc { > struct platform_device *dev; > int irq; > > + void __iomem *base; > struct mv_cap_regs __iomem *cap_regs; > struct mv_op_regs __iomem *op_regs; > - void __iomem *phy_regs; > unsigned int max_eps; > struct mv_dqh *ep_dqh; > size_t ep_dqh_size; > @@ -219,6 +222,8 @@ struct mv_udc { > > /* some SOC has mutiple clock sources for USB*/ > struct clk *clk; > + > + struct phy *phy; > }; > > /* endpoint data structure */ > diff --git a/drivers/usb/gadget/udc/mv_udc_core.c b/drivers/usb/gadget/udc/mv_udc_core.c > index 95f52232493b..c701c83d3af5 100644 > --- a/drivers/usb/gadget/udc/mv_udc_core.c > +++ b/drivers/usb/gadget/udc/mv_udc_core.c > @@ -1069,14 +1069,11 @@ static int mv_udc_enable_internal(struct mv_udc *udc) > if (retval) > return retval; > > - if (udc->pdata->phy_init) { > - retval = udc->pdata->phy_init(udc->phy_regs); > - if (retval) { > - dev_err(&udc->dev->dev, > - "init phy error %d\n", retval); > - udc_clock_disable(udc); > - return retval; > - } > + retval = phy_init(udc->phy); > + if (retval) { > + dev_err(&udc->dev->dev, "init phy error %d\n", retval); > + udc_clock_disable(udc); > + return retval; > } > udc->active = 1; > > @@ -1095,8 +1092,7 @@ static void mv_udc_disable_internal(struct mv_udc *udc) > { > if (udc->active) { > dev_dbg(&udc->dev->dev, "disable udc\n"); > - if (udc->pdata->phy_deinit) > - udc->pdata->phy_deinit(udc->phy_regs); > + phy_exit(udc->phy); > udc_clock_disable(udc); > udc->active = 0; > } > @@ -2147,30 +2143,16 @@ static int mv_udc_probe(struct platform_device *pdev) > if (IS_ERR(udc->clk)) > return PTR_ERR(udc->clk); > > - r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "capregs"); > + r = platform_get_resource(udc->dev, IORESOURCE_MEM, 0); > if (r == NULL) { > dev_err(&pdev->dev, "no I/O memory resource defined\n"); > return -ENODEV; > } > > - udc->cap_regs = (struct mv_cap_regs __iomem *) > - devm_ioremap(&pdev->dev, r->start, resource_size(r)); > - if (udc->cap_regs == NULL) { > - dev_err(&pdev->dev, "failed to map I/O memory\n"); > - return -EBUSY; > - } > - > - r = platform_get_resource_byname(udc->dev, IORESOURCE_MEM, "phyregs"); > - if (r == NULL) { > - dev_err(&pdev->dev, "no phy I/O memory resource defined\n"); > - return -ENODEV; > - } > + udc->base = devm_ioremap(&pdev->dev, r->start, resource_size(r)); > > - udc->phy_regs = devm_ioremap(&pdev->dev, r->start, resource_size(r)); > - if (udc->phy_regs == NULL) { > - dev_err(&pdev->dev, "failed to map phy I/O memory\n"); > - return -EBUSY; > - } > + udc->cap_regs = > + (void __iomem *) ((unsigned long)udc->base + U2x_CAPREGS_OFFSET); > > /* we will acces controller register, so enable the clk */ > retval = mv_udc_enable_internal(udc); -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: