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=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY 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 8FED0C04AB1 for ; Fri, 10 May 2019 01:53:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5A71C217F4 for ; Fri, 10 May 2019 01:53:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726802AbfEJBxb (ORCPT ); Thu, 9 May 2019 21:53:31 -0400 Received: from Mailgw01.mediatek.com ([1.203.163.78]:8184 "EHLO mailgw01.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1726765AbfEJBxb (ORCPT ); Thu, 9 May 2019 21:53:31 -0400 X-UUID: 271e0b596785462282f7b79aa87b7095-20190510 X-UUID: 271e0b596785462282f7b79aa87b7095-20190510 Received: from mtkcas32.mediatek.inc [(172.27.4.253)] by mailgw01.mediatek.com (envelope-from ) (mailgw01.mediatek.com ESMTP with TLS) with ESMTP id 1268623971; Fri, 10 May 2019 09:53:26 +0800 Received: from MTKCAS32.mediatek.inc (172.27.4.184) by MTKMBS31DR.mediatek.inc (172.27.6.102) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Fri, 10 May 2019 09:53:24 +0800 Received: from [10.17.3.153] (172.27.4.253) by MTKCAS32.mediatek.inc (172.27.4.170) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Fri, 10 May 2019 09:53:24 +0800 Message-ID: <1557453204.10179.275.camel@mhfsdcap03> Subject: Re: [PATCH v2 11/15] usb: renesas_usbhs: Add support for RZ/A2 From: Chunfeng Yun To: Chris Brandt CC: Rob Herring , Mark Rutland , Greg Kroah-Hartman , Simon Horman , Yoshihiro Shimoda , Geert Uytterhoeven , Sergei Shtylyov , , , Date: Fri, 10 May 2019 09:53:24 +0800 In-Reply-To: <20190509201142.10543-12-chris.brandt@renesas.com> References: <20190509201142.10543-1-chris.brandt@renesas.com> <20190509201142.10543-12-chris.brandt@renesas.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.2.3-0ubuntu6 Content-Transfer-Encoding: 7bit MIME-Version: 1.0 X-MTK: N Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org On Thu, 2019-05-09 at 15:11 -0500, Chris Brandt wrote: > The RZ/A2 is similar to the R-Car Gen3 with some small differences. > > Signed-off-by: Chris Brandt > --- > v2: > * combined RZA1 and RZA2 for fifo setting > * added braces to make code easier to read > * fixed and clean up usbhs_rza2_power_ctrl() > --- > drivers/usb/renesas_usbhs/Makefile | 2 +- > drivers/usb/renesas_usbhs/common.c | 12 +++++- > drivers/usb/renesas_usbhs/rza.h | 1 + > drivers/usb/renesas_usbhs/rza2.c | 79 ++++++++++++++++++++++++++++++++++++++ > include/linux/usb/renesas_usbhs.h | 1 + > 5 files changed, 93 insertions(+), 2 deletions(-) > create mode 100644 drivers/usb/renesas_usbhs/rza2.c > > diff --git a/drivers/usb/renesas_usbhs/Makefile b/drivers/usb/renesas_usbhs/Makefile > index 5c5b51bb48ef..a1fed56b0957 100644 > --- a/drivers/usb/renesas_usbhs/Makefile > +++ b/drivers/usb/renesas_usbhs/Makefile > @@ -5,7 +5,7 @@ > > obj-$(CONFIG_USB_RENESAS_USBHS) += renesas_usbhs.o > > -renesas_usbhs-y := common.o mod.o pipe.o fifo.o rcar2.o rcar3.o rza.o > +renesas_usbhs-y := common.o mod.o pipe.o fifo.o rcar2.o rcar3.o rza.o rza2.o > > ifneq ($(CONFIG_USB_RENESAS_USBHS_HCD),) > renesas_usbhs-y += mod_host.o > diff --git a/drivers/usb/renesas_usbhs/common.c b/drivers/usb/renesas_usbhs/common.c > index 820636fc4dc9..35d2298c03a0 100644 > --- a/drivers/usb/renesas_usbhs/common.c > +++ b/drivers/usb/renesas_usbhs/common.c > @@ -582,6 +582,10 @@ static const struct of_device_id usbhs_of_match[] = { > .compatible = "renesas,rza1-usbhs", > .data = (void *)USBHS_TYPE_RZA1, > }, > + { > + .compatible = "renesas,rza2-usbhs", > + .data = (void *)USBHS_TYPE_RZA2, > + }, > { }, > }; > MODULE_DEVICE_TABLE(of, usbhs_of_match); > @@ -614,7 +618,8 @@ static struct renesas_usbhs_platform_info *usbhs_parse_dt(struct device *dev) > dparam->pipe_size = ARRAY_SIZE(usbhsc_new_pipe); > } > > - if (dparam->type == USBHS_TYPE_RZA1) { > + if (dparam->type == USBHS_TYPE_RZA1 || > + dparam->type == USBHS_TYPE_RZA2) { > dparam->pipe_configs = usbhsc_new_pipe; > dparam->pipe_size = ARRAY_SIZE(usbhsc_new_pipe); > } > @@ -688,6 +693,11 @@ static int usbhs_probe(struct platform_device *pdev) > case USBHS_TYPE_RZA1: > priv->pfunc = usbhs_rza1_ops; > break; > + case USBHS_TYPE_RZA2: > + priv->pfunc = usbhs_rza2_ops; > + usbhsc_flags_set(priv, USBHSF_HAS_CNEN); > + usbhsc_flags_set(priv, USBHSF_CFIFO_BYTE_ADDR); > + break; > default: > if (!info->platform_callback.get_id) { > dev_err(&pdev->dev, "no platform callbacks"); > diff --git a/drivers/usb/renesas_usbhs/rza.h b/drivers/usb/renesas_usbhs/rza.h > index ca917ca54f6d..073a53d1d442 100644 > --- a/drivers/usb/renesas_usbhs/rza.h > +++ b/drivers/usb/renesas_usbhs/rza.h > @@ -2,3 +2,4 @@ > #include "common.h" > > extern const struct renesas_usbhs_platform_callback usbhs_rza1_ops; > +extern const struct renesas_usbhs_platform_callback usbhs_rza2_ops; > diff --git a/drivers/usb/renesas_usbhs/rza2.c b/drivers/usb/renesas_usbhs/rza2.c > new file mode 100644 > index 000000000000..a1d9eb2d40cf > --- /dev/null > +++ b/drivers/usb/renesas_usbhs/rza2.c > @@ -0,0 +1,79 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Renesas USB driver RZ/A2 initialization and power control > + * > + * Copyright (C) 2019 Chris Brandt > + * Copyright (C) 2019 Renesas Electronics Corporation > + */ > + > +#include > +#include > +#include > +#include > +#include "common.h" > +#include "rza.h" > + > + > +static int usbhs_rza2_hardware_init(struct platform_device *pdev) > +{ > + struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); > + > + if (IS_ENABLED(CONFIG_GENERIC_PHY)) { no need check it, if it's not enabled, phy_get() will return an error number. > + struct phy *phy = phy_get(&pdev->dev, "usb"); use devm_phy_get?? > + > + if (IS_ERR(phy)) > + return PTR_ERR(phy); > + > + priv->phy = phy; > + return 0; > + } > + return -ENXIO; > +} > + > +static int usbhs_rza2_hardware_exit(struct platform_device *pdev) > +{ > + struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); > + > + if (priv->phy) { > + phy_put(priv->phy); > + priv->phy = NULL; > + } > + > + return 0; > +} > + > +static int usbhs_rza2_power_ctrl(struct platform_device *pdev, > + void __iomem *base, int enable) > +{ > + struct usbhs_priv *priv = usbhs_pdev_to_priv(pdev); > + int retval = 0; > + > + if (!priv->phy) > + return -ENODEV; > + > + if (enable) { > + retval = phy_init(priv->phy); > + usbhs_bset(priv, SUSPMODE, SUSPM, SUSPM); > + udelay(100); /* Wait for PLL to become stable */ > + if (!retval) > + retval = phy_power_on(priv->phy); > + } else { > + usbhs_bset(priv, SUSPMODE, SUSPM, 0); > + phy_power_off(priv->phy); > + phy_exit(priv->phy); > + } > + > + return retval; > +} > + > +static int usbhs_rza2_get_id(struct platform_device *pdev) > +{ > + return USBHS_GADGET; > +} > + > +const struct renesas_usbhs_platform_callback usbhs_rza2_ops = { > + .hardware_init = usbhs_rza2_hardware_init, > + .hardware_exit = usbhs_rza2_hardware_exit, > + .power_ctrl = usbhs_rza2_power_ctrl, > + .get_id = usbhs_rza2_get_id, > +}; > diff --git a/include/linux/usb/renesas_usbhs.h b/include/linux/usb/renesas_usbhs.h > index 53924f8e840c..39604c8b1eed 100644 > --- a/include/linux/usb/renesas_usbhs.h > +++ b/include/linux/usb/renesas_usbhs.h > @@ -196,6 +196,7 @@ struct renesas_usbhs_driver_param { > #define USBHS_TYPE_RCAR_GEN3 2 > #define USBHS_TYPE_RCAR_GEN3_WITH_PLL 3 > #define USBHS_TYPE_RZA1 4 > +#define USBHS_TYPE_RZA2 5 > > /* > * option: