From: Chris Brandt <chris.brandt@renesas.com>
To: Rob Herring <robh+dt@kernel.org>,
Mark Rutland <mark.rutland@arm.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Simon Horman <horms@verge.net.au>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>,
Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>,
<linux-usb@vger.kernel.org>, <devicetree@vger.kernel.org>,
<linux-renesas-soc@vger.kernel.org>,
"Chris Brandt" <chris.brandt@renesas.com>
Subject: [PATCH v2 03/15] phy: renesas: rcar-gen3-usb2: detect usb_x1 clock
Date: Thu, 9 May 2019 15:11:30 -0500 [thread overview]
Message-ID: <20190509201142.10543-4-chris.brandt@renesas.com> (raw)
In-Reply-To: <20190509201142.10543-1-chris.brandt@renesas.com>
The RZ/A2 has an optional dedicated 48MHz clock input for the PLL.
If a clock node named 'usb_x1' exists and set to non-zero, then we can
assume we want it use it.
Signed-off-by: Chris Brandt <chris.brandt@renesas.com>
---
v2:
* use 'usb_x1' clock node instead of 'renesas,uses_usb_x1' property
---
drivers/phy/renesas/phy-rcar-gen3-usb2.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/drivers/phy/renesas/phy-rcar-gen3-usb2.c b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
index 1322185a00a2..1ebb08f8323f 100644
--- a/drivers/phy/renesas/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/renesas/phy-rcar-gen3-usb2.c
@@ -34,6 +34,7 @@
#define USB2_VBCTRL 0x60c
#define USB2_LINECTRL1 0x610
#define USB2_ADPCTRL 0x630
+#define USB2_PHYCLK_CTRL 0x644
/* INT_ENABLE */
#define USB2_INT_ENABLE_UCOM_INTEN BIT(3)
@@ -110,6 +111,7 @@ struct rcar_gen3_chan {
bool extcon_host;
bool is_otg_channel;
bool uses_otg_pins;
+ bool uses_usb_x1;
};
/*
@@ -391,6 +393,9 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
void __iomem *usb2_base = channel->base;
u32 val;
+ if (channel->uses_usb_x1)
+ writel(0x00000001, usb2_base + USB2_PHYCLK_CTRL);
+
/* Initialize USB2 part */
val = readl(usb2_base + USB2_INT_ENABLE);
val |= USB2_INT_ENABLE_UCOM_INTEN | rphy->int_enable_bits;
@@ -582,10 +587,12 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct rcar_gen3_chan *channel;
+ struct device_node *usb_x1_clk;
struct phy_provider *provider;
struct resource *res;
const struct phy_ops *phy_usb2_ops;
int irq, ret = 0, i;
+ u32 freq_usb = 0;
if (!dev->of_node) {
dev_err(dev, "This driver needs device tree\n");
@@ -630,6 +637,13 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
}
}
+ usb_x1_clk = of_find_node_by_name(NULL, "usb_x1");
+ if (usb_x1_clk) {
+ of_property_read_u32(usb_x1_clk, "clock-frequency", &freq_usb);
+ if (freq_usb)
+ channel->uses_usb_x1 = true;
+ }
+
/*
* devm_phy_create() will call pm_runtime_enable(&phy->dev);
* And then, phy-core will manage runtime pm for this device.
--
2.16.1
next prev parent reply other threads:[~2019-05-09 20:34 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-09 20:11 [PATCH v2 00/15] usb: Add host and device support for RZ/A2 Chris Brandt
2019-05-09 20:11 ` [PATCH v2 01/15] ARM: dts: r7s9210: Add USB clock Chris Brandt
2019-05-13 12:25 ` Simon Horman
2019-05-09 20:11 ` [PATCH v2 02/15] ARM: dts: rza2mevb: Add 48MHz " Chris Brandt
2019-05-13 12:26 ` Simon Horman
2019-05-09 20:11 ` Chris Brandt [this message]
2019-05-10 1:57 ` [PATCH v2 03/15] phy: renesas: rcar-gen3-usb2: detect usb_x1 clock Chunfeng Yun
2019-05-10 13:17 ` Chris Brandt
2019-05-10 4:17 ` Yoshihiro Shimoda
2019-05-10 6:56 ` Geert Uytterhoeven
2019-05-09 20:11 ` [PATCH v2 04/15] dt-bindings: rcar-gen3-phy-usb2: Document use of usb_x1 Chris Brandt
2019-05-10 4:38 ` Yoshihiro Shimoda
2019-05-10 6:55 ` Geert Uytterhoeven
2019-05-13 21:07 ` Chris Brandt
2019-05-13 21:12 ` Geert Uytterhoeven
2019-05-13 21:24 ` Chris Brandt
2019-05-09 20:11 ` [PATCH v2 05/15] phy: renesas: rcar-gen3-usb2: Check dr_mode when not using OTG Chris Brandt
2019-05-10 8:36 ` Sergei Shtylyov
2019-05-10 13:55 ` Chris Brandt
2019-05-11 7:39 ` Sergei Shtylyov
2019-05-11 12:05 ` Chris Brandt
2019-05-09 20:11 ` [PATCH v2 06/15] dt-bindings: rcar-gen3-phy-usb2: Document dr_mode Chris Brandt
2019-05-09 20:11 ` [PATCH v2 07/15] dt-bindings: rcar-gen3-phy-usb2: Add r7s9210 support Chris Brandt
2019-05-09 20:11 ` [PATCH v2 08/15] usb: renesas_usbhs: move flags macros Chris Brandt
2019-05-10 1:59 ` Chunfeng Yun
2019-05-10 8:41 ` Sergei Shtylyov
2019-05-10 14:00 ` Chris Brandt
2019-05-09 20:11 ` [PATCH v2 09/15] usb: renesas_usbhs: add support for CNEN bit Chris Brandt
2019-05-09 20:11 ` [PATCH v2 10/15] usb: renesas_usbhs: support byte addressable CFIFO Chris Brandt
2019-05-09 20:11 ` [PATCH v2 11/15] usb: renesas_usbhs: Add support for RZ/A2 Chris Brandt
2019-05-10 1:53 ` Chunfeng Yun
2019-05-10 13:10 ` Chris Brandt
2019-05-10 7:07 ` Geert Uytterhoeven
2019-05-10 8:16 ` Yoshihiro Shimoda
2019-05-10 11:00 ` Yoshihiro Shimoda
2019-05-10 14:20 ` Chris Brandt
2019-05-09 20:11 ` [PATCH v2 12/15] dt-bindings: usb: renesas_usbhs: Add support for r7s9210 Chris Brandt
2019-05-09 20:11 ` [PATCH v2 13/15] ARM: dts: r7s9210: Add USB Host support Chris Brandt
2019-05-09 20:11 ` [PATCH v2 14/15] ARM: dts: r7s9210: Add USB Device support Chris Brandt
2019-05-09 20:11 ` [PATCH v2 15/15] ARM: dts: rza2mevb: Add USB host support Chris Brandt
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=20190509201142.10543-4-chris.brandt@renesas.com \
--to=chris.brandt@renesas.com \
--cc=devicetree@vger.kernel.org \
--cc=geert@linux-m68k.org \
--cc=gregkh@linuxfoundation.org \
--cc=horms@verge.net.au \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--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).