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

login
register
mail settings
Submitter Mikko Perttunen
Date June 28, 2013, 12:33 p.m.
Message ID <1372422796-23524-4-git-send-email-mperttunen@nvidia.com>
Download mbox | patch
Permalink /patch/255356/
State Not Applicable, archived
Headers show

Comments

Mikko Perttunen - June 28, 2013, 12:33 p.m.
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@nvidia.com>
---
 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(-)
Stephen Warren - July 16, 2013, 5:29 p.m.
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@nvidia.com>

And the whole series,
Reviewed-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Stephen Warren <swarren@nvidia.com>

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

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 {