[PATCH v2 0/3] usb: tegra: Replace nvidia,vbus-gpio property with vbus-supply

[PATCH v2 0/3] usb: tegra: Replace nvidia,vbus-gpio property with vbus-supply

[Mikko Perttunen]

This patchset removes the ehci-tegra device tree property nvidia,vbus-gpio
and adds support for the vbus-supply property to phy-tegra-usb.

Mikko Perttunen (3):
  usb: phy,host: tegra: Use regulators instead of GPIOs for USB PHY VBUS
  Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for
    host mode PHYs
  ARM: dts: tegra20: Remove obsolete nvidia,vbus-gpio properties

 .../bindings/usb/nvidia,tegra20-usb-phy.txt        |  2 +-
 arch/arm/boot/dts/tegra20-seaboard.dts             |  1 -
 arch/arm/boot/dts/tegra20-trimslice.dts            |  1 -
 arch/arm/boot/dts/tegra20-whistler.dts             |  2 --
 drivers/usb/host/ehci-tegra.c                      | 34 +---------------------
 drivers/usb/phy/phy-tegra-usb.c                    | 23 +++++++++++++++
 include/linux/usb/tegra_usb_phy.h                  |  1 +
 7 files changed, 26 insertions(+), 38 deletions(-)

-- 
1.8.1.5

[PATCH v2 1/3] usb: phy,host: tegra: Use regulators instead of GPIOs for USB PHY VBUS

[Mikko Perttunen]

The tegra ehci driver has enabled USB vbus regulators directly using
GPIOs and the device tree attribute nvidia,vbus-gpio. This is ugly
and causes error messages on boot when both the regulator driver
and the ehci driver want access to the same GPIO.

After this patch, usb vbus regulators for tegra usb phy devices are specified
with the device tree attribute vbus-supply = <&x> where x is a regulator defined
in the device tree. The old nvidia,vbus-gpio property is no longer supported.

Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 drivers/usb/host/ehci-tegra.c     | 34 +---------------------------------
 drivers/usb/phy/phy-tegra-usb.c   | 23 +++++++++++++++++++++++
 include/linux/usb/tegra_usb_phy.h |  1 +
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index a1cec77..51cf1d2 100644
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -328,33 +328,6 @@ static void tegra_ehci_unmap_urb_for_dma(struct usb_hcd *hcd, struct urb *urb)
 	free_dma_aligned_buffer(urb);
 }
 
-static int setup_vbus_gpio(struct platform_device *pdev,
-			   struct tegra_ehci_platform_data *pdata)
-{
-	int err = 0;
-	int gpio;
-
-	gpio = pdata->vbus_gpio;
-	if (!gpio_is_valid(gpio))
-		gpio = of_get_named_gpio(pdev->dev.of_node,
-					 "nvidia,vbus-gpio", 0);
-	if (!gpio_is_valid(gpio))
-		return 0;
-
-	err = gpio_request(gpio, "vbus_gpio");
-	if (err) {
-		dev_err(&pdev->dev, "can't request vbus gpio %d", gpio);
-		return err;
-	}
-	err = gpio_direction_output(gpio, 1);
-	if (err) {
-		dev_err(&pdev->dev, "can't enable vbus\n");
-		return err;
-	}
-
-	return err;
-}
-
 static int tegra_ehci_probe(struct platform_device *pdev)
 {
 	struct resource *res;
@@ -382,14 +355,11 @@ static int tegra_ehci_probe(struct platform_device *pdev)
 	if (!pdev->dev.coherent_dma_mask)
 		pdev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 
-	setup_vbus_gpio(pdev, pdata);
-
 	hcd = usb_create_hcd(&tegra_ehci_hc_driver, &pdev->dev,
 					dev_name(&pdev->dev));
 	if (!hcd) {
 		dev_err(&pdev->dev, "Unable to create HCD\n");
-		err = -ENOMEM;
-		goto cleanup_vbus_gpio;
+		return -ENOMEM;
 	}
 	platform_set_drvdata(pdev, hcd);
 	ehci = hcd_to_ehci(hcd);
@@ -505,8 +475,6 @@ cleanup_clk_get:
 	clk_put(tegra->clk);
 cleanup_hcd_create:
 	usb_put_hcd(hcd);
-cleanup_vbus_gpio:
-	/* FIXME: Undo setup_vbus_gpio() here */
 	return err;
 }
 
diff --git a/drivers/usb/phy/phy-tegra-usb.c b/drivers/usb/phy/phy-tegra-usb.c
index d7d6bd7..cae96ee 100644
--- a/drivers/usb/phy/phy-tegra-usb.c
+++ b/drivers/usb/phy/phy-tegra-usb.c
@@ -34,6 +34,7 @@
 #include <asm/mach-types.h>
 #include <linux/usb/ehci_def.h>
 #include <linux/usb/tegra_usb_phy.h>
+#include <linux/regulator/consumer.h>
 
 #define ULPI_VIEWPORT		0x170
 
@@ -673,6 +674,9 @@ static void tegra_usb_phy_close(struct usb_phy *x)
 {
 	struct tegra_usb_phy *phy = container_of(x, struct tegra_usb_phy, u_phy);
 
+	if (!IS_ERR(phy->vbus))
+		regulator_disable(phy->vbus);
+
 	clk_disable_unprepare(phy->pll_u);
 }
 
@@ -772,6 +776,15 @@ static int tegra_usb_phy_init(struct tegra_usb_phy *phy)
 		goto fail;
 	}
 
+	if (!IS_ERR(phy->vbus)) {
+		err = regulator_enable(phy->vbus);
+		if (err) {
+			dev_err(phy->dev,
+				"failed to enable usb vbus regulator: %d\n", err);
+			goto fail;
+		}
+	}
+
 	if (phy->is_ulpi_phy)
 		err = ulpi_open(phy);
 	else
@@ -890,6 +903,16 @@ static int tegra_usb_phy_probe(struct platform_device *pdev)
 	} else
 		tegra_phy->mode = TEGRA_USB_PHY_MODE_OTG;
 
+	/* On some boards, the VBUS regulator doesn't need to be controlled */
+	if (of_find_property(np, "vbus-supply", NULL)) {
+		tegra_phy->vbus = devm_regulator_get(&pdev->dev, "vbus");
+		if (IS_ERR(tegra_phy->vbus))
+			return PTR_ERR(tegra_phy->vbus);
+	} else {
+		dev_notice(&pdev->dev, "no vbus regulator");
+		tegra_phy->vbus = ERR_PTR(-ENODEV);
+	}
+
 	tegra_phy->dev = &pdev->dev;
 	err = tegra_usb_phy_init(tegra_phy);
 	if (err < 0)
diff --git a/include/linux/usb/tegra_usb_phy.h b/include/linux/usb/tegra_usb_phy.h
index d2ca919..2b5fa94 100644
--- a/include/linux/usb/tegra_usb_phy.h
+++ b/include/linux/usb/tegra_usb_phy.h
@@ -55,6 +55,7 @@ struct tegra_usb_phy {
 	struct clk *clk;
 	struct clk *pll_u;
 	struct clk *pad_clk;
+	struct regulator *vbus;
 	enum tegra_usb_phy_mode mode;
 	void *config;
 	struct usb_phy *ulpi;
-- 
1.8.1.5

[PATCH v2 2/3] Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for host mode PHYs

[Mikko Perttunen]

Add vbus-supply as an optional property for host mode phy-tegra-usb PHYs.

Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
index c4c9e9e..59c4854 100644
--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
@@ -48,5 +48,5 @@ Optional properties:
       peripheral means it is device controller
       otg means it can operate as either ("on the go")
 
-Required properties for dr_mode == otg:
+VBUS control (required for dr_mode == host, optional for dr_mode == otg):
   - vbus-supply: regulator for VBUS
-- 
1.8.1.5

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 2/3] Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for host mode PHYs

[Stephen Warren]

On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
> Add vbus-supply as an optional property for host mode phy-tegra-usb PHYs.

Felipe, I see that you didn't merge this one patch from this series. Was
there a reason for that? At this stage, I would consider it reasonable
for DT binding documentation changes to go through the same tree as
driver changes.

Re: [PATCH v2 2/3] Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for host mode PHYs

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

On Mon, Jul 29, 2013 at 09:24:46AM -0600, Stephen Warren wrote:
> On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
> > Add vbus-supply as an optional property for host mode phy-tegra-usb PHYs.
> 
> Felipe, I see that you didn't merge this one patch from this series. Was
> there a reason for that? At this stage, I would consider it reasonable
> for DT binding documentation changes to go through the same tree as
> driver changes.

no reason, just missed it. Will apply now.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2 2/3] Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for host mode PHYs

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 2024 bytes --]

Hi,

On Tue, Jul 30, 2013 at 12:19:32AM +0300, Felipe Balbi wrote:
> On Mon, Jul 29, 2013 at 09:24:46AM -0600, Stephen Warren wrote:
> > On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
> > > Add vbus-supply as an optional property for host mode phy-tegra-usb PHYs.
> > 
> > Felipe, I see that you didn't merge this one patch from this series. Was
> > there a reason for that? At this stage, I would consider it reasonable
> > for DT binding documentation changes to go through the same tree as
> > driver changes.
> 
> no reason, just missed it. Will apply now.

actually, patch _is_ in my tree:

https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?h=next&id=80bd8a94712a0a9f2baeb03ad0546dd70f27ac4e

commit 80bd8a94712a0a9f2baeb03ad0546dd70f27ac4e
Author: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Date:   Wed Jul 17 10:37:50 2013 +0300

    usb: tegra: Add vbus-supply property for host mode PHYs
    
    Document vbus-supply as an optional property for host mode phy-tegra-usb PHYs.
    
    Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
    Reviewed-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
    Tested-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
    Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>

diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
index c4c9e9e..59c4854 100644
--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
@@ -48,5 +48,5 @@ Optional properties:
       peripheral means it is device controller
       otg means it can operate as either ("on the go")
 
-Required properties for dr_mode == otg:
+VBUS control (required for dr_mode == host, optional for dr_mode == otg):
   - vbus-supply: regulator for VBUS

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH v2 2/3] Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for host mode PHYs

[Stephen Warren]

On 07/29/2013 03:23 PM, Felipe Balbi wrote:
> Hi,
> 
> On Tue, Jul 30, 2013 at 12:19:32AM +0300, Felipe Balbi wrote:
>> On Mon, Jul 29, 2013 at 09:24:46AM -0600, Stephen Warren wrote:
>>> On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
>>>> Add vbus-supply as an optional property for host mode
>>>> phy-tegra-usb PHYs.
>>> 
>>> Felipe, I see that you didn't merge this one patch from this
>>> series. Was there a reason for that? At this stage, I would
>>> consider it reasonable for DT binding documentation changes to
>>> go through the same tree as driver changes.
>> 
>> no reason, just missed it. Will apply now.
> 
> actually, patch _is_ in my tree:
> 
> https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?h=next&id=80bd8a94712a0a9f2baeb03ad0546dd70f27ac4e

Oh
> 
so it is, thanks. I was thrown off by the modified patch subject;
sorry.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 2/3] Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for host mode PHYs

[Mikko Perttunen]

On 07/30/2013 12:23 AM, Felipe Balbi wrote:
> * PGP Signed by an unknown key
>
> Hi,
>
> On Tue, Jul 30, 2013 at 12:19:32AM +0300, Felipe Balbi wrote:
>> On Mon, Jul 29, 2013 at 09:24:46AM -0600, Stephen Warren wrote:
>>> On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
>>>> Add vbus-supply as an optional property for host mode phy-tegra-usb PHYs.
>>>
>>> Felipe, I see that you didn't merge this one patch from this series. Was
>>> there a reason for that? At this stage, I would consider it reasonable
>>> for DT binding documentation changes to go through the same tree as
>>> driver changes.
>>
>> no reason, just missed it. Will apply now.
>
> actually, patch _is_ in my tree:
>
> https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?h=next&id=80bd8a94712a0a9f2baeb03ad0546dd70f27ac4e
>
> commit 80bd8a94712a0a9f2baeb03ad0546dd70f27ac4e
> Author: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> Date:   Wed Jul 17 10:37:50 2013 +0300
>
>      usb: tegra: Add vbus-supply property for host mode PHYs
>
>      Document vbus-supply as an optional property for host mode phy-tegra-usb PHYs.
>
>      Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>      Reviewed-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>      Tested-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>      Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
>
> diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
> index c4c9e9e..59c4854 100644
> --- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
> +++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
> @@ -48,5 +48,5 @@ Optional properties:
>         peripheral means it is device controller
>         otg means it can operate as either ("on the go")
>
> -Required properties for dr_mode == otg:
> +VBUS control (required for dr_mode == host, optional for dr_mode == otg):
>     - vbus-supply: regulator for VBUS
>

Oops, looks like I've made a typo there while making the v2. This should 
be, optional for dr_mode == host, required for dr_mode == otg instead of 
the other way around. Can this fixup still be made?

Thanks, Mikko

Re: [PATCH v2 2/3] Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for host mode PHYs

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 2541 bytes --]

On Tue, Jul 30, 2013 at 09:10:12AM +0300, Mikko Perttunen wrote:
> On 07/30/2013 12:23 AM, Felipe Balbi wrote:
> >* PGP Signed by an unknown key
> >
> >Hi,
> >
> >On Tue, Jul 30, 2013 at 12:19:32AM +0300, Felipe Balbi wrote:
> >>On Mon, Jul 29, 2013 at 09:24:46AM -0600, Stephen Warren wrote:
> >>>On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
> >>>>Add vbus-supply as an optional property for host mode phy-tegra-usb PHYs.
> >>>
> >>>Felipe, I see that you didn't merge this one patch from this series. Was
> >>>there a reason for that? At this stage, I would consider it reasonable
> >>>for DT binding documentation changes to go through the same tree as
> >>>driver changes.
> >>
> >>no reason, just missed it. Will apply now.
> >
> >actually, patch _is_ in my tree:
> >
> >https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?h=next&id=80bd8a94712a0a9f2baeb03ad0546dd70f27ac4e
> >
> >commit 80bd8a94712a0a9f2baeb03ad0546dd70f27ac4e
> >Author: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >Date:   Wed Jul 17 10:37:50 2013 +0300
> >
> >     usb: tegra: Add vbus-supply property for host mode PHYs
> >
> >     Document vbus-supply as an optional property for host mode phy-tegra-usb PHYs.
> >
> >     Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >     Reviewed-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >     Tested-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
> >     Signed-off-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
> >
> >diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
> >index c4c9e9e..59c4854 100644
> >--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
> >+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
> >@@ -48,5 +48,5 @@ Optional properties:
> >        peripheral means it is device controller
> >        otg means it can operate as either ("on the go")
> >
> >-Required properties for dr_mode == otg:
> >+VBUS control (required for dr_mode == host, optional for dr_mode == otg):
> >    - vbus-supply: regulator for VBUS
> >
> 
> Oops, looks like I've made a typo there while making the v2. This
> should be, optional for dr_mode == host, required for dr_mode == otg
> instead of the other way around. Can this fixup still be made?

send a patch on top of that, please.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

[PATCH] Fix switched around host, otg in tegra20-usb-phy documentation

[Mikko Perttunen]

Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
index 59c4854..4c8ade8 100644
--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
@@ -48,5 +48,5 @@ Optional properties:
       peripheral means it is device controller
       otg means it can operate as either ("on the go")
 
-VBUS control (required for dr_mode == host, optional for dr_mode == otg):
+VBUS control (required for dr_mode == otg, optional for dr_mode == host):
   - vbus-supply: regulator for VBUS
-- 
1.8.1.5

Re: [PATCH] Fix switched around host, otg in tegra20-usb-phy documentation

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

On Tue, Jul 30, 2013 at 09:38:44AM +0300, Mikko Perttunen wrote:
> Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

return -ENOLOG;

sorry, I can't apply without a commit log. Please mention that the
previous commit had a typo which you're fixing.

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] Fix switched around host, otg in tegra20-usb-phy documentation

[Mikko Perttunen]

On 07/30/2013 09:44 AM, Felipe Balbi wrote:
> * PGP Signed by an unknown key
>
> On Tue, Jul 30, 2013 at 09:38:44AM +0300, Mikko Perttunen wrote:
>> Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>
> return -ENOLOG;
>
> sorry, I can't apply without a commit log. Please mention that the
> previous commit had a typo which you're fixing.
>

Sorry, for some reason I was thinking you could squash it. But of course 
that's not advisable since the repo is public.

[PATCH] usb: tegra: Fix typo in tegra20-usb-phy documentation

[Mikko Perttunen]

The device tree binding documentation for tegra20-usb-phy used to claim
that the vbus-supply property is required for host phys and optional
for otg phys. This should be the other way around.

Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
index 59c4854..4c8ade8 100644
--- a/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
+++ b/Documentation/devicetree/bindings/usb/nvidia,tegra20-usb-phy.txt
@@ -48,5 +48,5 @@ Optional properties:
       peripheral means it is device controller
       otg means it can operate as either ("on the go")
 
-VBUS control (required for dr_mode == host, optional for dr_mode == otg):
+VBUS control (required for dr_mode == otg, optional for dr_mode == host):
   - vbus-supply: regulator for VBUS
-- 
1.8.1.5

[PATCH v2 3/3] ARM: dts: tegra20: Remove obsolete nvidia,vbus-gpio properties

[Mikko Perttunen]

USB VBUS regulators are now specified with the vbus-supply property
instead of nvidia,vbus-gpio, so remove the obsolete properties.

The equivalent vbus-supply properties were already added in patch
"ARM: tegra: update device trees for USB binding rework".

Signed-off-by: Mikko Perttunen <mperttunen-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 arch/arm/boot/dts/tegra20-seaboard.dts  | 1 -
 arch/arm/boot/dts/tegra20-trimslice.dts | 1 -
 arch/arm/boot/dts/tegra20-whistler.dts  | 2 --
 3 files changed, 4 deletions(-)

diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index ab177b4..2ab4775 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -566,7 +566,6 @@
 
 	usb@c5000000 {
 		status = "okay";
-		nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
 		dr_mode = "otg";
 	};
 
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 1701599..bea4aaa 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -312,7 +312,6 @@
 
 	usb@c5000000 {
 		status = "okay";
-		nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
 	};
 
 	usb-phy@c5000000 {
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index ea078ab..e07f210 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -509,7 +509,6 @@
 
 	usb@c5000000 {
 		status = "okay";
-		nvidia,vbus-gpio = <&tca6416 0 GPIO_ACTIVE_HIGH>;
 	};
 
 	usb-phy@c5000000 {
@@ -519,7 +518,6 @@
 
 	usb@c5008000 {
 		status = "okay";
-		nvidia,vbus-gpio = <&tca6416 1 GPIO_ACTIVE_HIGH>;
 	};
 
 	usb-phy@c5008000 {
-- 
1.8.1.5

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 3/3] ARM: dts: tegra20: Remove obsolete nvidia,vbus-gpio properties

[Stephen Warren]

On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
> USB VBUS regulators are now specified with the vbus-supply property
> instead of nvidia,vbus-gpio, so remove the obsolete properties.
> 
> The equivalent vbus-supply properties were already added in patch
> "ARM: tegra: update device trees for USB binding rework".

(which is in v3.11-rc1, so there aren't any dependencies to worry about)

So, I think the chances of this patch causing any difficult conflicts
are minimal, so it's simplest to just take this series through the USB
tree rather than screwing around with cross-subsystem merge branches.

As such, this one patch,
Acked-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

And the whole series,
Reviewed-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
Tested-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

I would guess that since this series was sent a long time ago almost
during the merge window, it has fallen out of Felipe's and Greg's inbox,
so a resend might be in order. Mikko, if so, please cut/paste the
acked-/reviewed-/tested-by lines above into the commit description to
make life easier for Felipe and/or Greg. Thanks.

Re: [PATCH v2 0/3] usb: tegra: Replace nvidia,vbus-gpio property with vbus-supply

[Stephen Warren]

On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
> This patchset removes the ehci-tegra device tree property nvidia,vbus-gpio
> and adds support for the vbus-supply property to phy-tegra-usb.

With bug-fix patch "ARM: tegra: fix VBUS regulator GPIO polarity in DT"
(which I just sent) applied first, this series,

Tested-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Re: [PATCH v2 0/3] usb: tegra: Replace nvidia,vbus-gpio property with vbus-supply

[Mikko Perttunen]

Thanks for testing!

On 07/02/2013 12:08 AM, Stephen Warren wrote:
> On 06/28/2013 06:33 AM, Mikko Perttunen wrote:
>> This patchset removes the ehci-tegra device tree property nvidia,vbus-gpio
>> and adds support for the vbus-supply property to phy-tegra-usb.
>
> With bug-fix patch "ARM: tegra: fix VBUS regulator GPIO polarity in DT"
> (which I just sent) applied first, this series,
>
> Tested-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
>

Re: [PATCH v2 0/3] usb: tegra: Replace nvidia,vbus-gpio property with vbus-supply

[Mikko Perttunen]

Hey Felipe/Stephen,

what's the status of this patchset and the other one
("usb: phy: tegra: Read UTMI parameters from device tree")?
Can I consider them accepted/pulled for 3.12?

Thanks, Mikko

On 06/28/2013 03:33 PM, Mikko Perttunen wrote:
> This patchset removes the ehci-tegra device tree property nvidia,vbus-gpio
> and adds support for the vbus-supply property to phy-tegra-usb.
>
> Mikko Perttunen (3):
>    usb: phy,host: tegra: Use regulators instead of GPIOs for USB PHY VBUS
>    Documentation: devicetree: phy-tegra-usb: Add vbus-supply property for
>      host mode PHYs
>    ARM: dts: tegra20: Remove obsolete nvidia,vbus-gpio properties
>
>   .../bindings/usb/nvidia,tegra20-usb-phy.txt        |  2 +-
>   arch/arm/boot/dts/tegra20-seaboard.dts             |  1 -
>   arch/arm/boot/dts/tegra20-trimslice.dts            |  1 -
>   arch/arm/boot/dts/tegra20-whistler.dts             |  2 --
>   drivers/usb/host/ehci-tegra.c                      | 34 +---------------------
>   drivers/usb/phy/phy-tegra-usb.c                    | 23 +++++++++++++++
>   include/linux/usb/tegra_usb_phy.h                  |  1 +
>   7 files changed, 26 insertions(+), 38 deletions(-)
>
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 0/3] usb: tegra: Replace nvidia,vbus-gpio property with vbus-supply

[Stephen Warren]

On 07/15/2013 05:57 AM, Mikko Perttunen wrote:
> Hey Felipe/Stephen,
> 
> what's the status of this patchset and the other one
> ("usb: phy: tegra: Read UTMI parameters from device tree")?
> Can I consider them accepted/pulled for 3.12?

3.11-rc1 was just released over the weekend. Patches for 3.12 can only
just be applied now. I'm planning to look through all the USB cleanup
patches that have been posted recently, test them, and work out the best
way to merge them and handle any dependencies. I'll post mail once I've
done that.

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html