Patchwork [4/4] ARM: dts: tegra20: Remove obsolete vbus-gpio properties

login
register
mail settings
Submitter Mikko Perttunen
Date June 26, 2013, 9:59 a.m.
Message ID <1372240781-1017-5-git-send-email-mperttunen@nvidia.com>
Download mbox | patch
Permalink /patch/254681/
State Superseded, archived
Headers show

Comments

Mikko Perttunen - June 26, 2013, 9:59 a.m.
USB VBUS regulators are now specified with the vbus-supply property
instead of vbus-gpio, so remove the obsolete properties.

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(-)
Felipe Balbi - June 26, 2013, 10:17 a.m.
On Wed, Jun 26, 2013 at 12:59:41PM +0300, Mikko Perttunen wrote:
> USB VBUS regulators are now specified with the vbus-supply property
> instead of vbus-gpio, so remove the obsolete properties.
> 
> 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(-)
> 
> 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>;

silly question but don't you need to put a phandle to the VBUS regulator
here ?
Mikko Perttunen - June 26, 2013, 10:22 a.m.
On Wed, 26 Jun 2013 13:17:58 +0300, Felipe Balbi <balbi@ti.com> wrote:

> * PGP Signed by an unknown key
>
> On Wed, Jun 26, 2013 at 12:59:41PM +0300, Mikko Perttunen wrote:
>> USB VBUS regulators are now specified with the vbus-supply property
>> instead of vbus-gpio, so remove the obsolete properties.
>>
>> 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(-)
>>
>> 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>;
>
> silly question but don't you need to put a phandle to the VBUS regulator
> here ?
>

It's already there in the corresponding usb-phy node. They were added by
Venu Byravarasu in commit 4c94c8b5 "ARM: tegra: update device trees for
USB binding rework".
--
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
Felipe Balbi - June 26, 2013, 10:23 a.m.
Hi,

On Wed, Jun 26, 2013 at 01:22:07PM +0300, Mikko Perttunen wrote:
> On Wed, 26 Jun 2013 13:17:58 +0300, Felipe Balbi <balbi@ti.com> wrote:
> 
> >* PGP Signed by an unknown key
> >
> >On Wed, Jun 26, 2013 at 12:59:41PM +0300, Mikko Perttunen wrote:
> >>USB VBUS regulators are now specified with the vbus-supply property
> >>instead of vbus-gpio, so remove the obsolete properties.
> >>
> >>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(-)
> >>
> >>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>;
> >
> >silly question but don't you need to put a phandle to the VBUS regulator
> >here ?
> >
> 
> It's already there in the corresponding usb-phy node. They were added by
> Venu Byravarasu in commit 4c94c8b5 "ARM: tegra: update device trees for
> USB binding rework".

aaa alright, my bad :-)

cheers
Stephen Warren - June 26, 2013, 5:19 p.m.
On 06/26/2013 03:59 AM, Mikko Perttunen wrote:
> USB VBUS regulators are now specified with the vbus-supply property
> instead of vbus-gpio, so remove the obsolete properties.

As far as patch scheduling goes, I might be simpler to send one series
to convert the driver to the new properties, then once that has been
merged into a kernel release, we can apply patches to remove all the
legacy properties from DT in a later kernel release. That will save the
requirement for any cross-subsystem merges.

Although, if the USB maintainers are OK with doing it all at once, and
we can make sure this series gets merged into a separate topic branch so
that I can take it into the Tegra tree to resolve any merge conflicts
with any other Tegra DT modifications if needed, then applying this all
at once is fine.
--
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
Felipe Balbi - June 27, 2013, 6:49 a.m.
On Wed, Jun 26, 2013 at 11:19:45AM -0600, Stephen Warren wrote:
> On 06/26/2013 03:59 AM, Mikko Perttunen wrote:
> > USB VBUS regulators are now specified with the vbus-supply property
> > instead of vbus-gpio, so remove the obsolete properties.
> 
> As far as patch scheduling goes, I might be simpler to send one series
> to convert the driver to the new properties, then once that has been
> merged into a kernel release, we can apply patches to remove all the
> legacy properties from DT in a later kernel release. That will save the
> requirement for any cross-subsystem merges.
> 
> Although, if the USB maintainers are OK with doing it all at once, and
> we can make sure this series gets merged into a separate topic branch so
> that I can take it into the Tegra tree to resolve any merge conflicts
> with any other Tegra DT modifications if needed, then applying this all
> at once is fine.

I'd be fine with the merge from my side. It worked well in the previous
merge windows. Let's just not go crazy with it ;-)

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 {