From: Simon Horman <horms@verge.net.au>
To: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: kishon@ti.com, robh+dt@kernel.org, mark.rutland@arm.com,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-renesas-soc@vger.kernel.org
Subject: Re: [PATCH 5/8] phy: renesas: rcar-gen3-usb2: unify OBINTEN handling
Date: Tue, 25 Sep 2018 09:24:16 +0200 [thread overview]
Message-ID: <20180925072415.apfl6s5e7l5rwmxa@verge.net.au> (raw)
In-Reply-To: <1537530804-19399-6-git-send-email-yoshihiro.shimoda.uh@renesas.com>
On Fri, Sep 21, 2018 at 08:53:21PM +0900, Yoshihiro Shimoda wrote:
> This patch unifies the OBINTEN handling to clean-up the code.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
The nit below notwithstanding.
Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> drivers/phy/renesas/phy-rcar-gen3-usb2.c | 23 +++++++++++++++--------
> 1 file changed, 15 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> index 856056e..e7eaed9 100644
> --- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> +++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
> @@ -142,6 +142,18 @@ static void rcar_gen3_enable_vbus_ctrl(struct rcar_gen3_chan *ch, int vbus)
> writel(val, usb2_base + USB2_ADPCTRL);
> }
>
> +static void rcar_gen3_control_otg_irq(struct rcar_gen3_chan *ch, int enable)
> +{
nit: Perhaps bool would be a better type for the enable parameter.
> + void __iomem *usb2_base = ch->base;
> + u32 val = readl(usb2_base + USB2_OBINTEN);
> +
> + if (enable)
> + val |= USB2_OBINT_BITS;
> + else
> + val &= ~USB2_OBINT_BITS;
> + writel(val, usb2_base + USB2_OBINTEN);
> +}
> +
> static void rcar_gen3_init_for_host(struct rcar_gen3_chan *ch)
> {
> rcar_gen3_set_linectrl(ch, 1, 1);
> @@ -187,16 +199,12 @@ static void rcar_gen3_init_for_a_peri(struct rcar_gen3_chan *ch)
>
> static void rcar_gen3_init_from_a_peri_to_a_host(struct rcar_gen3_chan *ch)
> {
> - void __iomem *usb2_base = ch->base;
> - u32 val;
> -
> - val = readl(usb2_base + USB2_OBINTEN);
> - writel(val & ~USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
> + rcar_gen3_control_otg_irq(ch, 0);
>
> rcar_gen3_enable_vbus_ctrl(ch, 1);
> rcar_gen3_init_for_host(ch);
>
> - writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
> + rcar_gen3_control_otg_irq(ch, 1);
> }
>
> static bool rcar_gen3_check_id(struct rcar_gen3_chan *ch)
> @@ -286,8 +294,7 @@ static void rcar_gen3_init_otg(struct rcar_gen3_chan *ch)
> val = readl(usb2_base + USB2_VBCTRL);
> writel(val | USB2_VBCTRL_DRVVBUSSEL, usb2_base + USB2_VBCTRL);
> writel(USB2_OBINT_BITS, usb2_base + USB2_OBINTSTA);
> - val = readl(usb2_base + USB2_OBINTEN);
> - writel(val | USB2_OBINT_BITS, usb2_base + USB2_OBINTEN);
> + rcar_gen3_control_otg_irq(ch, 1);
> val = readl(usb2_base + USB2_ADPCTRL);
> writel(val | USB2_ADPCTRL_IDPULLUP, usb2_base + USB2_ADPCTRL);
> val = readl(usb2_base + USB2_LINECTRL1);
> --
> 1.9.1
>
next prev parent reply other threads:[~2018-09-25 7:24 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 11:53 [PATCH 0/8] phy: renesas: rcar-gen3-usb2: re-design for all R-Car Gen3 SoCs Yoshihiro Shimoda
2018-09-21 11:53 ` [PATCH 1/8] dt-bindings: rcar-gen3-phy-usb2: add no-otg-pins property Yoshihiro Shimoda
2018-09-25 7:31 ` Simon Horman
2018-10-15 14:49 ` Rob Herring
2018-09-21 11:53 ` [PATCH 2/8] phy: renesas: rcar-gen3-usb2: fix vbus_ctrl for role sysfs Yoshihiro Shimoda
2018-09-25 7:30 ` Simon Horman
2018-09-21 11:53 ` [PATCH 3/8] phy: renesas: rcar-gen3-usb2: Rename has_otg_pins to uses_otg_pins Yoshihiro Shimoda
2018-09-25 7:31 ` Simon Horman
2018-09-21 11:53 ` [PATCH 4/8] phy: renesas: rcar-gen3-usb2: Check a property to use otg pins Yoshihiro Shimoda
2018-09-25 7:25 ` Simon Horman
2018-09-21 11:53 ` [PATCH 5/8] phy: renesas: rcar-gen3-usb2: unify OBINTEN handling Yoshihiro Shimoda
2018-09-25 7:24 ` Simon Horman [this message]
2018-09-21 11:53 ` [PATCH 6/8] phy: renesas: rcar-gen3-usb2: change a condition "dr_mode" Yoshihiro Shimoda
2018-09-25 7:31 ` Simon Horman
2018-09-21 11:53 ` [PATCH 7/8] phy: renesas: rcar-gen3-usb2: add conditions for uses_otg_pins == false Yoshihiro Shimoda
2018-09-25 7:30 ` Simon Horman
2018-09-21 11:53 ` [PATCH 8/8] phy: renesas: rcar-gen3-usb2: add is_otg_channel to use "role" sysfs Yoshihiro Shimoda
2018-09-25 7:31 ` Simon Horman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180925072415.apfl6s5e7l5rwmxa@verge.net.au \
--to=horms@verge.net.au \
--cc=devicetree@vger.kernel.org \
--cc=kishon@ti.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).