* [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
@ 2016-01-07 9:16 Yoshihiro Shimoda
2016-01-09 22:33 ` Rob Herring
0 siblings, 1 reply; 6+ messages in thread
From: Yoshihiro Shimoda @ 2016-01-07 9:16 UTC (permalink / raw)
To: kishon, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak
Cc: linux-kernel, devicetree, linux-sh, Yoshihiro Shimoda
Since the related driver (CPG/MSSR driver) only manages the first module
clock, this driver should not handle the HSUSB registers. So, this patch
removes the HSUSB registers handling.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
This patch is based on the linux-phy / next branch.
(commit id = 9955a7835bf376e12482583958b2661f501b868b)
.../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 15 ++--
drivers/phy/phy-rcar-gen3-usb2.c | 83 +++-------------------
2 files changed, 15 insertions(+), 83 deletions(-)
diff --git a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
index 2390e4e..eaf7e9b 100644
--- a/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
+++ b/Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt
@@ -7,33 +7,26 @@ Required properties:
- compatible: "renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795
SoC.
- reg: offset and length of the partial USB 2.0 Host register block.
-- reg-names: must be "usb2_host".
- clocks: clock phandle and specifier pair(s).
- #phy-cells: see phy-bindings.txt in the same directory, must be <0>.
Optional properties:
To use a USB channel where USB 2.0 Host and HSUSB (USB 2.0 Peripheral) are
-combined, the device tree node should set HSUSB properties to reg and reg-names
-properties. This is because HSUSB has registers to select USB 2.0 host or
-peripheral at that channel:
-- reg: offset and length of the partial HSUSB register block.
-- reg-names: must be "hsusb".
+combined, the device tree node should set interrupt properties to use the
+channel as USB OTG:
- interrupts: interrupt specifier for the PHY.
Example (R-Car H3):
usb-phy@ee080200 {
compatible = "renesas,usb2-phy-r8a7795";
- reg = <0 0xee080200 0 0x700>, <0 0xe6590100 0 0x100>;
- reg-names = "usb2_host", "hsusb";
+ reg = <0 0xee080200 0 0x700>;
interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&mstp7_clks R8A7795_CLK_EHCI0>,
- <&mstp7_clks R8A7795_CLK_HSUSB>;
+ clocks = <&mstp7_clks R8A7795_CLK_EHCI0>;
};
usb-phy@ee0a0200 {
compatible = "renesas,usb2-phy-r8a7795";
reg = <0 0xee0a0200 0 0x700>;
- reg-names = "usb2_host";
clocks = <&mstp7_clks R8A7795_CLK_EHCI0>;
};
diff --git a/drivers/phy/phy-rcar-gen3-usb2.c b/drivers/phy/phy-rcar-gen3-usb2.c
index ef332ef..bc4f7dd 100644
--- a/drivers/phy/phy-rcar-gen3-usb2.c
+++ b/drivers/phy/phy-rcar-gen3-usb2.c
@@ -74,20 +74,6 @@
#define USB2_ADPCTRL_IDPULLUP BIT(5) /* 1 = ID sampling is enabled */
#define USB2_ADPCTRL_DRVVBUS BIT(4)
-/******* HSUSB registers (original offset is +0x100) *******/
-#define HSUSB_LPSTS 0x02
-#define HSUSB_UGCTRL2 0x84
-
-/* Low Power Status register (LPSTS) */
-#define HSUSB_LPSTS_SUSPM 0x4000
-
-/* USB General control register 2 (UGCTRL2) */
-#define HSUSB_UGCTRL2_MASK 0x00000031 /* bit[31:6] should be 0 */
-#define HSUSB_UGCTRL2_USB0SEL 0x00000030
-#define HSUSB_UGCTRL2_USB0SEL_HOST 0x00000010
-#define HSUSB_UGCTRL2_USB0SEL_HS_USB 0x00000020
-#define HSUSB_UGCTRL2_USB0SEL_OTG 0x00000030
-
struct rcar_gen3_data {
void __iomem *base;
struct clk *clk;
@@ -95,8 +81,8 @@ struct rcar_gen3_data {
struct rcar_gen3_chan {
struct rcar_gen3_data usb2;
- struct rcar_gen3_data hsusb;
struct phy *phy;
+ bool has_otg;
};
static void rcar_gen3_set_host_mode(struct rcar_gen3_chan *ch, int host)
@@ -202,24 +188,15 @@ static int rcar_gen3_phy_usb2_init(struct phy *p)
{
struct rcar_gen3_chan *channel = phy_get_drvdata(p);
void __iomem *usb2_base = channel->usb2.base;
- void __iomem *hsusb_base = channel->hsusb.base;
- u32 val;
/* Initialize USB2 part */
writel(USB2_INT_ENABLE_INIT, usb2_base + USB2_INT_ENABLE);
writel(USB2_SPD_RSM_TIMSET_INIT, usb2_base + USB2_SPD_RSM_TIMSET);
writel(USB2_OC_TIMSET_INIT, usb2_base + USB2_OC_TIMSET);
- /* Initialize HSUSB part */
- if (hsusb_base) {
- val = readl(hsusb_base + HSUSB_UGCTRL2);
- val = (val & ~HSUSB_UGCTRL2_USB0SEL) |
- HSUSB_UGCTRL2_USB0SEL_OTG;
- writel(val & HSUSB_UGCTRL2_MASK, hsusb_base + HSUSB_UGCTRL2);
-
- /* Initialize otg part */
+ /* Initialize otg part */
+ if (channel->has_otg)
rcar_gen3_init_otg(channel);
- }
return 0;
}
@@ -237,7 +214,6 @@ static int rcar_gen3_phy_usb2_power_on(struct phy *p)
{
struct rcar_gen3_chan *channel = phy_get_drvdata(p);
void __iomem *usb2_base = channel->usb2.base;
- void __iomem *hsusb_base = channel->hsusb.base;
u32 val;
val = readl(usb2_base + USB2_USBCTR);
@@ -246,33 +222,6 @@ static int rcar_gen3_phy_usb2_power_on(struct phy *p)
val &= ~USB2_USBCTR_PLL_RST;
writel(val, usb2_base + USB2_USBCTR);
- /*
- * TODO: To reduce power consuming, this driver should set the SUSPM
- * after the PHY detects ID pin as peripheral.
- */
- if (hsusb_base) {
- /* Power on HSUSB PHY */
- val = readw(hsusb_base + HSUSB_LPSTS);
- val |= HSUSB_LPSTS_SUSPM;
- writew(val, hsusb_base + HSUSB_LPSTS);
- }
-
- return 0;
-}
-
-static int rcar_gen3_phy_usb2_power_off(struct phy *p)
-{
- struct rcar_gen3_chan *channel = phy_get_drvdata(p);
- void __iomem *hsusb_base = channel->hsusb.base;
- u32 val;
-
- if (hsusb_base) {
- /* Power off HSUSB PHY */
- val = readw(hsusb_base + HSUSB_LPSTS);
- val &= ~HSUSB_LPSTS_SUSPM;
- writew(val, hsusb_base + HSUSB_LPSTS);
- }
-
return 0;
}
@@ -280,7 +229,6 @@ static struct phy_ops rcar_gen3_phy_usb2_ops = {
.init = rcar_gen3_phy_usb2_init,
.exit = rcar_gen3_phy_usb2_exit,
.power_on = rcar_gen3_phy_usb2_power_on,
- .power_off = rcar_gen3_phy_usb2_power_off,
.owner = THIS_MODULE,
};
@@ -313,6 +261,7 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
struct rcar_gen3_chan *channel;
struct phy_provider *provider;
struct resource *res;
+ int irq;
if (!dev->of_node) {
dev_err(dev, "This driver needs device tree\n");
@@ -323,29 +272,19 @@ static int rcar_gen3_phy_usb2_probe(struct platform_device *pdev)
if (!channel)
return -ENOMEM;
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "usb2_host");
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
channel->usb2.base = devm_ioremap_resource(dev, res);
if (IS_ERR(channel->usb2.base))
return PTR_ERR(channel->usb2.base);
- /* "hsusb" memory resource is optional */
- res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "hsusb");
-
- /* To avoid error message by devm_ioremap_resource() */
- if (res) {
- int irq;
-
- channel->hsusb.base = devm_ioremap_resource(dev, res);
- if (IS_ERR(channel->hsusb.base))
- channel->hsusb.base = NULL;
- /* call request_irq for OTG */
- irq = platform_get_irq(pdev, 0);
- if (irq >= 0)
- irq = devm_request_irq(dev, irq, rcar_gen3_phy_usb2_irq,
- IRQF_SHARED, dev_name(dev),
- channel);
+ /* call request_irq for OTG */
+ irq = platform_get_irq(pdev, 0);
+ if (irq >= 0) {
+ irq = devm_request_irq(dev, irq, rcar_gen3_phy_usb2_irq,
+ IRQF_SHARED, dev_name(dev), channel);
if (irq < 0)
dev_err(dev, "No irq handler (%d)\n", irq);
+ channel->has_otg = true;
}
/* devm_phy_create() will call pm_runtime_enable(dev); */
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
2016-01-07 9:16 [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling Yoshihiro Shimoda
@ 2016-01-09 22:33 ` Rob Herring
2016-02-02 8:29 ` Yoshihiro Shimoda
2016-02-23 6:24 ` Yoshihiro Shimoda
0 siblings, 2 replies; 6+ messages in thread
From: Rob Herring @ 2016-01-09 22:33 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: kishon, pawel.moll, mark.rutland, ijc+devicetree, galak,
linux-kernel, devicetree, linux-sh
On Thu, Jan 07, 2016 at 06:16:44PM +0900, Yoshihiro Shimoda wrote:
> Since the related driver (CPG/MSSR driver) only manages the first module
> clock, this driver should not handle the HSUSB registers. So, this patch
> removes the HSUSB registers handling.
>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
> This patch is based on the linux-phy / next branch.
> (commit id = 9955a7835bf376e12482583958b2661f501b868b)
>
> .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 15 ++--
Acked-by: Rob Herring <robh@kernel.org>
> drivers/phy/phy-rcar-gen3-usb2.c | 83 +++-------------------
> 2 files changed, 15 insertions(+), 83 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
2016-01-09 22:33 ` Rob Herring
@ 2016-02-02 8:29 ` Yoshihiro Shimoda
2016-02-23 6:24 ` Yoshihiro Shimoda
1 sibling, 0 replies; 6+ messages in thread
From: Yoshihiro Shimoda @ 2016-02-02 8:29 UTC (permalink / raw)
To: kishon
Cc: pawel.moll, mark.rutland, ijc+devicetree, galak, linux-kernel,
devicetree, linux-sh, Rob Herring, linux-renesas-soc
Hi Kishon,
Would you review this patch?
I checked the latest linux-phy.git / next branch today, and it is the same as the following.
> > This patch is based on the linux-phy / next branch.
> > (commit id = 9955a7835bf376e12482583958b2661f501b868b)
Best regards,
Yoshihiro Shimoda
> From: Rob Herring [mailto:robh@kernel.org]
> Sent: Sunday, January 10, 2016 7:33 AM
> To: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> Cc: kishon@ti.com; pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org;
> linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; linux-sh@vger.kernel.org
> Subject: Re: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
>
> On Thu, Jan 07, 2016 at 06:16:44PM +0900, Yoshihiro Shimoda wrote:
> > Since the related driver (CPG/MSSR driver) only manages the first module
> > clock, this driver should not handle the HSUSB registers. So, this patch
> > removes the HSUSB registers handling.
> >
> > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > ---
> > This patch is based on the linux-phy / next branch.
> > (commit id = 9955a7835bf376e12482583958b2661f501b868b)
> >
> > .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 15 ++--
>
> Acked-by: Rob Herring <robh@kernel.org>
>
> > drivers/phy/phy-rcar-gen3-usb2.c | 83 +++-------------------
> > 2 files changed, 15 insertions(+), 83 deletions(-)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
2016-01-09 22:33 ` Rob Herring
2016-02-02 8:29 ` Yoshihiro Shimoda
@ 2016-02-23 6:24 ` Yoshihiro Shimoda
2016-02-23 6:37 ` Kishon Vijay Abraham I
1 sibling, 1 reply; 6+ messages in thread
From: Yoshihiro Shimoda @ 2016-02-23 6:24 UTC (permalink / raw)
To: kishon
Cc: pawel.moll, mark.rutland, ijc+devicetree, galak, linux-kernel,
devicetree, linux-sh, Rob Herring, linux-renesas-soc
Hi Kishon,
Would you review this patch?
I checked the latest linux-phy.git / next branch today,
this patch can be applied on the top of branch.
commit 6b825eb7323a634cdd1014a4aa9a8ff07cf8040c
Author: Heiko Stuebner <heiko@sntech.de>
Date: Mon Feb 22 12:55:01 2016 +0100
phy: rockchip-usb: add handler for usb-uart functionality
Best regards,
Yoshihiro Shimoda
> -----Original Message-----
> From: Yoshihiro Shimoda
> Sent: Tuesday, February 02, 2016 5:29 PM
> To: kishon@ti.com
> Cc: pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org;
> linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; linux-sh@vger.kernel.org; 'Rob Herring' <robh@kernel.org>;
> linux-renesas-soc@vger.kernel.org
> Subject: RE: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
>
> Hi Kishon,
>
> Would you review this patch?
> I checked the latest linux-phy.git / next branch today, and it is the same as the following.
>
> > > This patch is based on the linux-phy / next branch.
> > > (commit id = 9955a7835bf376e12482583958b2661f501b868b)
>
> Best regards,
> Yoshihiro Shimoda
>
> > From: Rob Herring [mailto:robh@kernel.org]
> > Sent: Sunday, January 10, 2016 7:33 AM
> > To: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > Cc: kishon@ti.com; pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org;
> > linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; linux-sh@vger.kernel.org
> > Subject: Re: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
> >
> > On Thu, Jan 07, 2016 at 06:16:44PM +0900, Yoshihiro Shimoda wrote:
> > > Since the related driver (CPG/MSSR driver) only manages the first module
> > > clock, this driver should not handle the HSUSB registers. So, this patch
> > > removes the HSUSB registers handling.
> > >
> > > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > > ---
> > > This patch is based on the linux-phy / next branch.
> > > (commit id = 9955a7835bf376e12482583958b2661f501b868b)
> > >
> > > .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 15 ++--
> >
> > Acked-by: Rob Herring <robh@kernel.org>
> >
> > > drivers/phy/phy-rcar-gen3-usb2.c | 83 +++-------------------
> > > 2 files changed, 15 insertions(+), 83 deletions(-)
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
2016-02-23 6:24 ` Yoshihiro Shimoda
@ 2016-02-23 6:37 ` Kishon Vijay Abraham I
2016-02-23 7:11 ` Yoshihiro Shimoda
0 siblings, 1 reply; 6+ messages in thread
From: Kishon Vijay Abraham I @ 2016-02-23 6:37 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: pawel.moll, mark.rutland, ijc+devicetree, galak, linux-kernel,
devicetree, linux-sh, Rob Herring, linux-renesas-soc
Hi,
On Tuesday 23 February 2016 11:54 AM, Yoshihiro Shimoda wrote:
> Hi Kishon,
>
> Would you review this patch?
merged it now. Thanks for reminding.
-Kishon
>
> I checked the latest linux-phy.git / next branch today,
> this patch can be applied on the top of branch.
>
> commit 6b825eb7323a634cdd1014a4aa9a8ff07cf8040c
> Author: Heiko Stuebner <heiko@sntech.de>
> Date: Mon Feb 22 12:55:01 2016 +0100
>
> phy: rockchip-usb: add handler for usb-uart functionality
>
> Best regards,
> Yoshihiro Shimoda
>
>> -----Original Message-----
>> From: Yoshihiro Shimoda
>> Sent: Tuesday, February 02, 2016 5:29 PM
>> To: kishon@ti.com
>> Cc: pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org;
>> linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; linux-sh@vger.kernel.org; 'Rob Herring' <robh@kernel.org>;
>> linux-renesas-soc@vger.kernel.org
>> Subject: RE: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
>>
>> Hi Kishon,
>>
>> Would you review this patch?
>> I checked the latest linux-phy.git / next branch today, and it is the same as the following.
>>
>>>> This patch is based on the linux-phy / next branch.
>>>> (commit id = 9955a7835bf376e12482583958b2661f501b868b)
>>
>> Best regards,
>> Yoshihiro Shimoda
>>
>>> From: Rob Herring [mailto:robh@kernel.org]
>>> Sent: Sunday, January 10, 2016 7:33 AM
>>> To: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>>> Cc: kishon@ti.com; pawel.moll@arm.com; mark.rutland@arm.com; ijc+devicetree@hellion.org.uk; galak@codeaurora.org;
>>> linux-kernel@vger.kernel.org; devicetree@vger.kernel.org; linux-sh@vger.kernel.org
>>> Subject: Re: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
>>>
>>> On Thu, Jan 07, 2016 at 06:16:44PM +0900, Yoshihiro Shimoda wrote:
>>>> Since the related driver (CPG/MSSR driver) only manages the first module
>>>> clock, this driver should not handle the HSUSB registers. So, this patch
>>>> removes the HSUSB registers handling.
>>>>
>>>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>>>> ---
>>>> This patch is based on the linux-phy / next branch.
>>>> (commit id = 9955a7835bf376e12482583958b2661f501b868b)
>>>>
>>>> .../devicetree/bindings/phy/rcar-gen3-phy-usb2.txt | 15 ++--
>>>
>>> Acked-by: Rob Herring <robh@kernel.org>
>>>
>>>> drivers/phy/phy-rcar-gen3-usb2.c | 83 +++-------------------
>>>> 2 files changed, 15 insertions(+), 83 deletions(-)
>>>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* RE: [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling
2016-02-23 6:37 ` Kishon Vijay Abraham I
@ 2016-02-23 7:11 ` Yoshihiro Shimoda
0 siblings, 0 replies; 6+ messages in thread
From: Yoshihiro Shimoda @ 2016-02-23 7:11 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: pawel.moll, mark.rutland, ijc+devicetree, galak, linux-kernel,
devicetree, linux-sh, Rob Herring, linux-renesas-soc
Hi,
> Hi,
>
> On Tuesday 23 February 2016 11:54 AM, Yoshihiro Shimoda wrote:
> > Hi Kishon,
> >
> > Would you review this patch?
>
> merged it now. Thanks for reminding.
Thank you!
Best regards,
Yoshihiro Shimoda
> -Kishon
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2016-02-23 7:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-01-07 9:16 [PATCH] phy: rcar-gen3-usb2: remove HSUSB registers handling Yoshihiro Shimoda
2016-01-09 22:33 ` Rob Herring
2016-02-02 8:29 ` Yoshihiro Shimoda
2016-02-23 6:24 ` Yoshihiro Shimoda
2016-02-23 6:37 ` Kishon Vijay Abraham I
2016-02-23 7:11 ` Yoshihiro Shimoda
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).