[PATCH v3 1/2] usb: host: xhci-plat: add optional PHY support

[PATCH v3 1/2] usb: host: xhci-plat: add optional PHY support

[Yoshihiro Shimoda]

From: Gregory CLEMENT <gregory.clement@free-electrons.com>

This commit extends the xhci-plat so that it can optionally be passed
a reference to a PHY through the Device Tree. It will be useful for
the Armada 375 SoCs. If no PHY is provided then the behavior of the
driver is unchanged.

As for the clock, to achieve this, it adds a 'struct phy *' member in
xhci_hcd. While only used for now in xhci-plat, here again, it might
be used by other drivers in the future.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 drivers/usb/host/xhci-plat.c |   27 ++++++++++++++++++++++++++-
 drivers/usb/host/xhci.h      |    2 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 29d8adb..1389370 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -15,6 +15,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>

@@ -99,6 +100,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
 	struct resource         *res;
 	struct usb_hcd		*hcd;
 	struct clk              *clk;
+	struct phy              *phy;
 	int			ret;
 	int			irq;

@@ -165,9 +167,23 @@ static int xhci_plat_probe(struct platform_device *pdev)
 			goto unmap_registers;
 	}

+	phy = devm_phy_optional_get(&pdev->dev, "usb");
+	if (IS_ERR(phy)) {
+		ret = PTR_ERR(phy);
+		goto disable_clk;
+	} else {
+		ret = phy_init(phy);
+		if (ret)
+			goto disable_clk;
+
+		ret = phy_power_on(phy);
+		if (ret)
+			goto disable_phy;
+	}
+
 	ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (ret)
-		goto disable_clk;
+		goto power_off_phy;

 	device_wakeup_enable(hcd->self.controller);

@@ -203,6 +219,12 @@ put_usb3_hcd:
 dealloc_usb2_hcd:
 	usb_remove_hcd(hcd);

+power_off_phy:
+	phy_power_off(phy);
+
+disable_phy:
+	phy_exit(phy);
+
 disable_clk:
 	if (!IS_ERR(clk))
 		clk_disable_unprepare(clk);
@@ -224,6 +246,7 @@ static int xhci_plat_remove(struct platform_device *dev)
 	struct usb_hcd	*hcd = platform_get_drvdata(dev);
 	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
 	struct clk *clk = xhci->clk;
+	struct phy *phy = xhci->phy;

 	usb_remove_hcd(xhci->shared_hcd);
 	usb_put_hcd(xhci->shared_hcd);
@@ -231,6 +254,8 @@ static int xhci_plat_remove(struct platform_device *dev)
 	usb_remove_hcd(hcd);
 	if (!IS_ERR(clk))
 		clk_disable_unprepare(clk);
+	phy_power_off(phy);
+	phy_exit(phy);
 	iounmap(hcd->regs);
 	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 	usb_put_hcd(hcd);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 9ffecd5..fa4bf17 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1474,6 +1474,8 @@ struct xhci_hcd {
 	struct msix_entry	*msix_entries;
 	/* optional clock */
 	struct clk		*clk;
+	/* optional phy */
+	struct phy		*phy;
 	/* data structures */
 	struct xhci_device_context_array *dcbaa;
 	struct xhci_ring	*cmd_ring;
-- 
1.7.9.5

[PATCH v3 1/2] usb: host: xhci-plat: add optional PHY support

[Yoshihiro Shimoda]

From: Gregory CLEMENT <gregory.clement@free-electrons.com>

This commit extends the xhci-plat so that it can optionally be passed
a reference to a PHY through the Device Tree. It will be useful for
the Armada 375 SoCs. If no PHY is provided then the behavior of the
driver is unchanged.

As for the clock, to achieve this, it adds a 'struct phy *' member in
xhci_hcd. While only used for now in xhci-plat, here again, it might
be used by other drivers in the future.

Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
 drivers/usb/host/xhci-plat.c |   27 ++++++++++++++++++++++++++-
 drivers/usb/host/xhci.h      |    2 ++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 29d8adb..1389370 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -15,6 +15,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>

@@ -99,6 +100,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
 	struct resource         *res;
 	struct usb_hcd		*hcd;
 	struct clk              *clk;
+	struct phy              *phy;
 	int			ret;
 	int			irq;

@@ -165,9 +167,23 @@ static int xhci_plat_probe(struct platform_device *pdev)
 			goto unmap_registers;
 	}

+	phy = devm_phy_optional_get(&pdev->dev, "usb");
+	if (IS_ERR(phy)) {
+		ret = PTR_ERR(phy);
+		goto disable_clk;
+	} else {
+		ret = phy_init(phy);
+		if (ret)
+			goto disable_clk;
+
+		ret = phy_power_on(phy);
+		if (ret)
+			goto disable_phy;
+	}
+
 	ret = usb_add_hcd(hcd, irq, IRQF_SHARED);
 	if (ret)
-		goto disable_clk;
+		goto power_off_phy;

 	device_wakeup_enable(hcd->self.controller);

@@ -203,6 +219,12 @@ put_usb3_hcd:
 dealloc_usb2_hcd:
 	usb_remove_hcd(hcd);

+power_off_phy:
+	phy_power_off(phy);
+
+disable_phy:
+	phy_exit(phy);
+
 disable_clk:
 	if (!IS_ERR(clk))
 		clk_disable_unprepare(clk);
@@ -224,6 +246,7 @@ static int xhci_plat_remove(struct platform_device *dev)
 	struct usb_hcd	*hcd = platform_get_drvdata(dev);
 	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
 	struct clk *clk = xhci->clk;
+	struct phy *phy = xhci->phy;

 	usb_remove_hcd(xhci->shared_hcd);
 	usb_put_hcd(xhci->shared_hcd);
@@ -231,6 +254,8 @@ static int xhci_plat_remove(struct platform_device *dev)
 	usb_remove_hcd(hcd);
 	if (!IS_ERR(clk))
 		clk_disable_unprepare(clk);
+	phy_power_off(phy);
+	phy_exit(phy);
 	iounmap(hcd->regs);
 	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
 	usb_put_hcd(hcd);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 9ffecd5..fa4bf17 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1474,6 +1474,8 @@ struct xhci_hcd {
 	struct msix_entry	*msix_entries;
 	/* optional clock */
 	struct clk		*clk;
+	/* optional phy */
+	struct phy		*phy;
 	/* data structures */
 	struct xhci_device_context_array *dcbaa;
 	struct xhci_ring	*cmd_ring;
-- 
1.7.9.5

Re: [PATCH v3 1/2] usb: host: xhci-plat: add optional PHY support

[Sergei Shtylyov]

Hello.

On 05/29/2014 05:32 AM, Yoshihiro Shimoda wrote:

> From: Gregory CLEMENT <gregory.clement@free-electrons.com>

> This commit extends the xhci-plat so that it can optionally be passed
> a reference to a PHY through the Device Tree. It will be useful for
> the Armada 375 SoCs. If no PHY is provided then the behavior of the
> driver is unchanged.

> As for the clock, to achieve this, it adds a 'struct phy *' member in
> xhci_hcd. While only used for now in xhci-plat, here again, it might
> be used by other drivers in the future.

> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>   drivers/usb/host/xhci-plat.c |   27 ++++++++++++++++++++++++++-
>   drivers/usb/host/xhci.h      |    2 ++
>   2 files changed, 28 insertions(+), 1 deletion(-)

    I've already posted a patch adding generic PHY support to all USB HCDs 
about 1.5 months ago, which should make this patch unneeded.

WBR, Sergei

Re: [PATCH v3 1/2] usb: host: xhci-plat: add optional PHY support

[Sergei Shtylyov]

Hello.

On 05/29/2014 05:32 AM, Yoshihiro Shimoda wrote:

> From: Gregory CLEMENT <gregory.clement@free-electrons.com>

> This commit extends the xhci-plat so that it can optionally be passed
> a reference to a PHY through the Device Tree. It will be useful for
> the Armada 375 SoCs. If no PHY is provided then the behavior of the
> driver is unchanged.

> As for the clock, to achieve this, it adds a 'struct phy *' member in
> xhci_hcd. While only used for now in xhci-plat, here again, it might
> be used by other drivers in the future.

> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> ---
>   drivers/usb/host/xhci-plat.c |   27 ++++++++++++++++++++++++++-
>   drivers/usb/host/xhci.h      |    2 ++
>   2 files changed, 28 insertions(+), 1 deletion(-)

    I've already posted a patch adding generic PHY support to all USB HCDs 
about 1.5 months ago, which should make this patch unneeded.

WBR, Sergei

Re: [PATCH v3 1/2] usb: host: xhci-plat: add optional PHY support

[Yoshihiro Shimoda]

Hello.

(2014/05/30 2:17), Sergei Shtylyov wrote:
> Hello.
> 
> On 05/29/2014 05:32 AM, Yoshihiro Shimoda wrote:
> 
>> From: Gregory CLEMENT <gregory.clement@free-electrons.com>
> 
>> This commit extends the xhci-plat so that it can optionally be passed
>> a reference to a PHY through the Device Tree. It will be useful for
>> the Armada 375 SoCs. If no PHY is provided then the behavior of the
>> driver is unchanged.
> 
>> As for the clock, to achieve this, it adds a 'struct phy *' member in
>> xhci_hcd. While only used for now in xhci-plat, here again, it might
>> be used by other drivers in the future.
> 
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>> ---
>>   drivers/usb/host/xhci-plat.c |   27 ++++++++++++++++++++++++++-
>>   drivers/usb/host/xhci.h      |    2 ++
>>   2 files changed, 28 insertions(+), 1 deletion(-)
> 
>     I've already posted a patch adding generic PHY support to all USB HCDs 
> about 1.5 months ago, which should make this patch unneeded.

Thank you for the point. So, I will not use this patch.
And, I could clean up xhci-rcar patch! (ioremap is not needed)

Best regards,
Yoshihiro Shimoda

> WBR, Sergei
> 

-- 
Yoshihiro Shimoda

Re: [PATCH v3 1/2] usb: host: xhci-plat: add optional PHY support

[Yoshihiro Shimoda]

Hello.

(2014/05/30 2:17), Sergei Shtylyov wrote:
> Hello.
> 
> On 05/29/2014 05:32 AM, Yoshihiro Shimoda wrote:
> 
>> From: Gregory CLEMENT <gregory.clement@free-electrons.com>
> 
>> This commit extends the xhci-plat so that it can optionally be passed
>> a reference to a PHY through the Device Tree. It will be useful for
>> the Armada 375 SoCs. If no PHY is provided then the behavior of the
>> driver is unchanged.
> 
>> As for the clock, to achieve this, it adds a 'struct phy *' member in
>> xhci_hcd. While only used for now in xhci-plat, here again, it might
>> be used by other drivers in the future.
> 
>> Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
>> Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
>> ---
>>   drivers/usb/host/xhci-plat.c |   27 ++++++++++++++++++++++++++-
>>   drivers/usb/host/xhci.h      |    2 ++
>>   2 files changed, 28 insertions(+), 1 deletion(-)
> 
>     I've already posted a patch adding generic PHY support to all USB HCDs 
> about 1.5 months ago, which should make this patch unneeded.

Thank you for the point. So, I will not use this patch.
And, I could clean up xhci-rcar patch! (ioremap is not needed)

Best regards,
Yoshihiro Shimoda

> WBR, Sergei
> 

-- 
Yoshihiro Shimoda

[PATCH v3 1/2] usb: host: xhci-plat: add R-Car Gen2 and Gen3 fallback compatibility strings

[Simon Horman]

Add fallback compatibility strings for R-Car Gen2 and Gen3.

This is in keeping with the fallback scheme being adopted wherever
appropriate for drivers for Renesas SoCs.

Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

---
v3
* Refer to Armada 38x rather than Armada 380 SoCs
  as the binding is also used by Armada 385 SoCs
* Added Ack from Geert Uytterhoeven

v2
* Use consistent line ending in documentation
* Group compat strings at the bottom of usb_xhci_of_match[]
---
 Documentation/devicetree/bindings/usb/usb-xhci.txt | 21 +++++++++++++++++----
 drivers/usb/host/xhci-plat.c                       |  5 +++++
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
index 082573289f1e..6a17aa85c4d5 100644
--- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
+++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
@@ -1,10 +1,23 @@
 USB xHCI controllers
 
 Required properties:
-  - compatible: should be one of "generic-xhci",
-    "marvell,armada-375-xhci", "marvell,armada-380-xhci",
-    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793",
-    "renesas,xhci-r8a7795" (deprecated: "xhci-platform").
+  - compatible: should be one or more of
+
+    - "generic-xhci" for generic XHCI device
+    - "marvell,armada-375-xhci" for Armada 375 SoCs
+    - "marvell,armada-380-xhci" for Armada 38x SoCs
+    - "renesas,xhci-r8a7790" for r8a7790 SoC
+    - "renesas,xhci-r8a7791" for r8a7791 SoC
+    - "renesas,xhci-r8a7793" for r8a7793 SoC
+    - "renesas,xhci-r8a7795" for r8a7795 SoC
+    - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 compatible device
+    - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device
+    - "xhci-platform" (deprecated)
+
+    When compatible with the generic version, nodes must list the
+    SoC-specific version corresponding to the platform first
+    followed by the generic version.
+
   - reg: should contain address and length of the standard XHCI
     register set for the device.
   - interrupts: one XHCI interrupt should be described here.
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
index 770b6b088797..05d09d7547ea 100644
--- a/drivers/usb/host/xhci-plat.c
+++ b/drivers/usb/host/xhci-plat.c
@@ -110,6 +110,11 @@ static const struct of_device_id usb_xhci_of_match[] = {
 		.compatible = "renesas,xhci-r8a7795",
 		.data = &xhci_plat_renesas_rcar_gen3,
 	}, {
+		.compatible = "renesas,rcar-gen2-xhci",
+		.data = &xhci_plat_renesas_rcar_gen2,
+	}, {
+		.compatible = "renesas,rcar-gen3-xhci",
+		.data = &xhci_plat_renesas_rcar_gen3,
 	},
 };
 MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
-- 
2.1.4

Re: [PATCH v3 1/2] usb: host: xhci-plat: add R-Car Gen2 and Gen3 fallback compatibility strings

[Gregory CLEMENT]

Hi Simon,
 
 On mer., janv. 13 2016, Simon Horman <horms+renesas@verge.net.au> wrote:

> Add fallback compatibility strings for R-Car Gen2 and Gen3.
>
> This is in keeping with the fallback scheme being adopted wherever
> appropriate for drivers for Renesas SoCs.
>
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

Thanks,

Gregory

>
> ---
> v3
> * Refer to Armada 38x rather than Armada 380 SoCs
>   as the binding is also used by Armada 385 SoCs
> * Added Ack from Geert Uytterhoeven
>
> v2
> * Use consistent line ending in documentation
> * Group compat strings at the bottom of usb_xhci_of_match[]
> ---
>  Documentation/devicetree/bindings/usb/usb-xhci.txt | 21 +++++++++++++++++----
>  drivers/usb/host/xhci-plat.c                       |  5 +++++
>  2 files changed, 22 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/usb/usb-xhci.txt b/Documentation/devicetree/bindings/usb/usb-xhci.txt
> index 082573289f1e..6a17aa85c4d5 100644
> --- a/Documentation/devicetree/bindings/usb/usb-xhci.txt
> +++ b/Documentation/devicetree/bindings/usb/usb-xhci.txt
> @@ -1,10 +1,23 @@
>  USB xHCI controllers
>  
>  Required properties:
> -  - compatible: should be one of "generic-xhci",
> -    "marvell,armada-375-xhci", "marvell,armada-380-xhci",
> -    "renesas,xhci-r8a7790", "renesas,xhci-r8a7791", "renesas,xhci-r8a7793",
> -    "renesas,xhci-r8a7795" (deprecated: "xhci-platform").
> +  - compatible: should be one or more of
> +
> +    - "generic-xhci" for generic XHCI device
> +    - "marvell,armada-375-xhci" for Armada 375 SoCs
> +    - "marvell,armada-380-xhci" for Armada 38x SoCs
> +    - "renesas,xhci-r8a7790" for r8a7790 SoC
> +    - "renesas,xhci-r8a7791" for r8a7791 SoC
> +    - "renesas,xhci-r8a7793" for r8a7793 SoC
> +    - "renesas,xhci-r8a7795" for r8a7795 SoC
> +    - "renesas,rcar-gen2-xhci" for a generic R-Car Gen2 compatible device
> +    - "renesas,rcar-gen3-xhci" for a generic R-Car Gen3 compatible device
> +    - "xhci-platform" (deprecated)
> +
> +    When compatible with the generic version, nodes must list the
> +    SoC-specific version corresponding to the platform first
> +    followed by the generic version.
> +
>    - reg: should contain address and length of the standard XHCI
>      register set for the device.
>    - interrupts: one XHCI interrupt should be described here.
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index 770b6b088797..05d09d7547ea 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -110,6 +110,11 @@ static const struct of_device_id usb_xhci_of_match[] = {
>  		.compatible = "renesas,xhci-r8a7795",
>  		.data = &xhci_plat_renesas_rcar_gen3,
>  	}, {
> +		.compatible = "renesas,rcar-gen2-xhci",
> +		.data = &xhci_plat_renesas_rcar_gen2,
> +	}, {
> +		.compatible = "renesas,rcar-gen3-xhci",
> +		.data = &xhci_plat_renesas_rcar_gen3,
>  	},
>  };
>  MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
> -- 
> 2.1.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com