diff mbox

[v3,05/10] ARM: dts: omap3-beagle: Use reset-gpios for hsusb2_reset

Message ID 1380012836-29900-6-git-send-email-rogerq@ti.com (mailing list archive)
State New, archived
Headers show

Commit Message

Roger Quadros Sept. 24, 2013, 8:53 a.m. UTC
We no longer need to model the RESET line as a regulator since
the USB phy-nop driver accepts "reset-gpios" property.

Signed-off-by: Roger Quadros <rogerq@ti.com>
---
 arch/arm/boot/dts/omap3-beagle.dts |   13 +------------
 1 files changed, 1 insertions(+), 12 deletions(-)

Comments

Roger Quadros Oct. 3, 2013, 10:34 a.m. UTC | #1
Hi Benoit,

Could you please take the device tree related patches [5 to 10] in this series?
Thanks.

cheers,
-roger

On 09/24/2013 11:53 AM, Roger Quadros wrote:
> We no longer need to model the RESET line as a regulator since
> the USB phy-nop driver accepts "reset-gpios" property.
> 
> Signed-off-by: Roger Quadros <rogerq@ti.com>
> ---
>  arch/arm/boot/dts/omap3-beagle.dts |   13 +------------
>  1 files changed, 1 insertions(+), 12 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
> index dfd8310..71bde47 100644
> --- a/arch/arm/boot/dts/omap3-beagle.dts
> +++ b/arch/arm/boot/dts/omap3-beagle.dts
> @@ -44,17 +44,6 @@
>  		};
>  	};
>  
> -	/* HS USB Port 2 RESET */
> -	hsusb2_reset: hsusb2_reset_reg {
> -		compatible = "regulator-fixed";
> -		regulator-name = "hsusb2_reset";
> -		regulator-min-microvolt = <3300000>;
> -		regulator-max-microvolt = <3300000>;
> -		gpio = <&gpio5 19 0>;	/* gpio_147 */
> -		startup-delay-us = <70000>;
> -		enable-active-high;
> -	};
> -
>  	/* HS USB Port 2 Power */
>  	hsusb2_power: hsusb2_power_reg {
>  		compatible = "regulator-fixed";
> @@ -68,7 +57,7 @@
>  	/* HS USB Host PHY on PORT 2 */
>  	hsusb2_phy: hsusb2_phy {
>  		compatible = "usb-nop-xceiv";
> -		reset-supply = <&hsusb2_reset>;
> +		reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>;	/* gpio_147 */
>  		vcc-supply = <&hsusb2_power>;
>  	};
>  
>
Benoit Cousson Oct. 3, 2013, 12:05 p.m. UTC | #2
Hi Roger,

Yes, I will. I've been waiting for these ones for so long :-)

Thanks,
Benoit

On 03/10/2013 12:34, Roger Quadros wrote:
> Hi Benoit,
>
> Could you please take the device tree related patches [5 to 10] in this series?
> Thanks.
>
> cheers,
> -roger
>
> On 09/24/2013 11:53 AM, Roger Quadros wrote:
>> We no longer need to model the RESET line as a regulator since
>> the USB phy-nop driver accepts "reset-gpios" property.
>>
>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>> ---
>>   arch/arm/boot/dts/omap3-beagle.dts |   13 +------------
>>   1 files changed, 1 insertions(+), 12 deletions(-)
>>
>> diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
>> index dfd8310..71bde47 100644
>> --- a/arch/arm/boot/dts/omap3-beagle.dts
>> +++ b/arch/arm/boot/dts/omap3-beagle.dts
>> @@ -44,17 +44,6 @@
>>   		};
>>   	};
>>
>> -	/* HS USB Port 2 RESET */
>> -	hsusb2_reset: hsusb2_reset_reg {
>> -		compatible = "regulator-fixed";
>> -		regulator-name = "hsusb2_reset";
>> -		regulator-min-microvolt = <3300000>;
>> -		regulator-max-microvolt = <3300000>;
>> -		gpio = <&gpio5 19 0>;	/* gpio_147 */
>> -		startup-delay-us = <70000>;
>> -		enable-active-high;
>> -	};
>> -
>>   	/* HS USB Port 2 Power */
>>   	hsusb2_power: hsusb2_power_reg {
>>   		compatible = "regulator-fixed";
>> @@ -68,7 +57,7 @@
>>   	/* HS USB Host PHY on PORT 2 */
>>   	hsusb2_phy: hsusb2_phy {
>>   		compatible = "usb-nop-xceiv";
>> -		reset-supply = <&hsusb2_reset>;
>> +		reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>;	/* gpio_147 */
>>   		vcc-supply = <&hsusb2_power>;
>>   	};
>>
>>
>
Benoit Cousson Oct. 3, 2013, 1:44 p.m. UTC | #3
On 03/10/2013 14:05, Benoit Cousson wrote:
> Hi Roger,
>
> Yes, I will. I've been waiting for these ones for so long :-)

In fact it does not apply correctly on my for_3.13/dts branch :-(

error: arch/arm/boot/dts/omap3-beagle.dts: patch does not apply
Patch failed at 0004 ARM: dts: omap3-beagle: Make USB host pin naming 
consistent

Could you rebase it?

Thanks,
Benoit


>
> Thanks,
> Benoit
>
> On 03/10/2013 12:34, Roger Quadros wrote:
>> Hi Benoit,
>>
>> Could you please take the device tree related patches [5 to 10] in
>> this series?
>> Thanks.
>>
>> cheers,
>> -roger
>>
>> On 09/24/2013 11:53 AM, Roger Quadros wrote:
>>> We no longer need to model the RESET line as a regulator since
>>> the USB phy-nop driver accepts "reset-gpios" property.
>>>
>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>> ---
>>>   arch/arm/boot/dts/omap3-beagle.dts |   13 +------------
>>>   1 files changed, 1 insertions(+), 12 deletions(-)
>>>
>>> diff --git a/arch/arm/boot/dts/omap3-beagle.dts
>>> b/arch/arm/boot/dts/omap3-beagle.dts
>>> index dfd8310..71bde47 100644
>>> --- a/arch/arm/boot/dts/omap3-beagle.dts
>>> +++ b/arch/arm/boot/dts/omap3-beagle.dts
>>> @@ -44,17 +44,6 @@
>>>           };
>>>       };
>>>
>>> -    /* HS USB Port 2 RESET */
>>> -    hsusb2_reset: hsusb2_reset_reg {
>>> -        compatible = "regulator-fixed";
>>> -        regulator-name = "hsusb2_reset";
>>> -        regulator-min-microvolt = <3300000>;
>>> -        regulator-max-microvolt = <3300000>;
>>> -        gpio = <&gpio5 19 0>;    /* gpio_147 */
>>> -        startup-delay-us = <70000>;
>>> -        enable-active-high;
>>> -    };
>>> -
>>>       /* HS USB Port 2 Power */
>>>       hsusb2_power: hsusb2_power_reg {
>>>           compatible = "regulator-fixed";
>>> @@ -68,7 +57,7 @@
>>>       /* HS USB Host PHY on PORT 2 */
>>>       hsusb2_phy: hsusb2_phy {
>>>           compatible = "usb-nop-xceiv";
>>> -        reset-supply = <&hsusb2_reset>;
>>> +        reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>;    /* gpio_147 */
>>>           vcc-supply = <&hsusb2_power>;
>>>       };
>>>
>>>
>>
>
Roger Quadros Oct. 3, 2013, 1:58 p.m. UTC | #4
Hi Benoit,

On 10/03/2013 04:44 PM, Benoit Cousson wrote:
> On 03/10/2013 14:05, Benoit Cousson wrote:
>> Hi Roger,
>>
>> Yes, I will. I've been waiting for these ones for so long :-)
> 
> In fact it does not apply correctly on my for_3.13/dts branch :-(
> 
> error: arch/arm/boot/dts/omap3-beagle.dts: patch does not apply
> Patch failed at 0004 ARM: dts: omap3-beagle: Make USB host pin naming consistent
> 
> Could you rebase it?

Looks like it was already applied before. Could you please skip that and use the rest?
I've checked that the remaining patches apply fine on top of your for_3.13/dts
branch. 

cheers,
-roger

>>
>> On 03/10/2013 12:34, Roger Quadros wrote:
>>> Hi Benoit,
>>>
>>> Could you please take the device tree related patches [5 to 10] in
>>> this series?
>>> Thanks.
>>>
>>> cheers,
>>> -roger
>>>
>>> On 09/24/2013 11:53 AM, Roger Quadros wrote:
>>>> We no longer need to model the RESET line as a regulator since
>>>> the USB phy-nop driver accepts "reset-gpios" property.
>>>>
>>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>>> ---
>>>>   arch/arm/boot/dts/omap3-beagle.dts |   13 +------------
>>>>   1 files changed, 1 insertions(+), 12 deletions(-)
>>>>
>>>> diff --git a/arch/arm/boot/dts/omap3-beagle.dts
>>>> b/arch/arm/boot/dts/omap3-beagle.dts
>>>> index dfd8310..71bde47 100644
>>>> --- a/arch/arm/boot/dts/omap3-beagle.dts
>>>> +++ b/arch/arm/boot/dts/omap3-beagle.dts
>>>> @@ -44,17 +44,6 @@
>>>>           };
>>>>       };
>>>>
>>>> -    /* HS USB Port 2 RESET */
>>>> -    hsusb2_reset: hsusb2_reset_reg {
>>>> -        compatible = "regulator-fixed";
>>>> -        regulator-name = "hsusb2_reset";
>>>> -        regulator-min-microvolt = <3300000>;
>>>> -        regulator-max-microvolt = <3300000>;
>>>> -        gpio = <&gpio5 19 0>;    /* gpio_147 */
>>>> -        startup-delay-us = <70000>;
>>>> -        enable-active-high;
>>>> -    };
>>>> -
>>>>       /* HS USB Port 2 Power */
>>>>       hsusb2_power: hsusb2_power_reg {
>>>>           compatible = "regulator-fixed";
>>>> @@ -68,7 +57,7 @@
>>>>       /* HS USB Host PHY on PORT 2 */
>>>>       hsusb2_phy: hsusb2_phy {
>>>>           compatible = "usb-nop-xceiv";
>>>> -        reset-supply = <&hsusb2_reset>;
>>>> +        reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>;    /* gpio_147 */
>>>>           vcc-supply = <&hsusb2_power>;
>>>>       };
>>>>
>>>>
>>>
>>
>
Benoit Cousson Oct. 3, 2013, 2:25 p.m. UTC | #5
On 03/10/2013 15:58, Roger Quadros wrote:
> Hi Benoit,
>
> On 10/03/2013 04:44 PM, Benoit Cousson wrote:
>> On 03/10/2013 14:05, Benoit Cousson wrote:
>>> Hi Roger,
>>>
>>> Yes, I will. I've been waiting for these ones for so long :-)
>>
>> In fact it does not apply correctly on my for_3.13/dts branch :-(
>>
>> error: arch/arm/boot/dts/omap3-beagle.dts: patch does not apply
>> Patch failed at 0004 ARM: dts: omap3-beagle: Make USB host pin naming consistent
>>
>> Could you rebase it?
>
> Looks like it was already applied before. Could you please skip that and use the rest?
> I've checked that the remaining patches apply fine on top of your for_3.13/dts
> branch.

Indeed, it was already there :-)

Sorry for the noise.

Benoit

>
> cheers,
> -roger
>
>>>
>>> On 03/10/2013 12:34, Roger Quadros wrote:
>>>> Hi Benoit,
>>>>
>>>> Could you please take the device tree related patches [5 to 10] in
>>>> this series?
>>>> Thanks.
>>>>
>>>> cheers,
>>>> -roger
>>>>
>>>> On 09/24/2013 11:53 AM, Roger Quadros wrote:
>>>>> We no longer need to model the RESET line as a regulator since
>>>>> the USB phy-nop driver accepts "reset-gpios" property.
>>>>>
>>>>> Signed-off-by: Roger Quadros <rogerq@ti.com>
>>>>> ---
>>>>>    arch/arm/boot/dts/omap3-beagle.dts |   13 +------------
>>>>>    1 files changed, 1 insertions(+), 12 deletions(-)
>>>>>
>>>>> diff --git a/arch/arm/boot/dts/omap3-beagle.dts
>>>>> b/arch/arm/boot/dts/omap3-beagle.dts
>>>>> index dfd8310..71bde47 100644
>>>>> --- a/arch/arm/boot/dts/omap3-beagle.dts
>>>>> +++ b/arch/arm/boot/dts/omap3-beagle.dts
>>>>> @@ -44,17 +44,6 @@
>>>>>            };
>>>>>        };
>>>>>
>>>>> -    /* HS USB Port 2 RESET */
>>>>> -    hsusb2_reset: hsusb2_reset_reg {
>>>>> -        compatible = "regulator-fixed";
>>>>> -        regulator-name = "hsusb2_reset";
>>>>> -        regulator-min-microvolt = <3300000>;
>>>>> -        regulator-max-microvolt = <3300000>;
>>>>> -        gpio = <&gpio5 19 0>;    /* gpio_147 */
>>>>> -        startup-delay-us = <70000>;
>>>>> -        enable-active-high;
>>>>> -    };
>>>>> -
>>>>>        /* HS USB Port 2 Power */
>>>>>        hsusb2_power: hsusb2_power_reg {
>>>>>            compatible = "regulator-fixed";
>>>>> @@ -68,7 +57,7 @@
>>>>>        /* HS USB Host PHY on PORT 2 */
>>>>>        hsusb2_phy: hsusb2_phy {
>>>>>            compatible = "usb-nop-xceiv";
>>>>> -        reset-supply = <&hsusb2_reset>;
>>>>> +        reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>;    /* gpio_147 */
>>>>>            vcc-supply = <&hsusb2_power>;
>>>>>        };
>>>>>
>>>>>
>>>>
>>>
>>
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index dfd8310..71bde47 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -44,17 +44,6 @@ 
 		};
 	};
 
-	/* HS USB Port 2 RESET */
-	hsusb2_reset: hsusb2_reset_reg {
-		compatible = "regulator-fixed";
-		regulator-name = "hsusb2_reset";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-		gpio = <&gpio5 19 0>;	/* gpio_147 */
-		startup-delay-us = <70000>;
-		enable-active-high;
-	};
-
 	/* HS USB Port 2 Power */
 	hsusb2_power: hsusb2_power_reg {
 		compatible = "regulator-fixed";
@@ -68,7 +57,7 @@ 
 	/* HS USB Host PHY on PORT 2 */
 	hsusb2_phy: hsusb2_phy {
 		compatible = "usb-nop-xceiv";
-		reset-supply = <&hsusb2_reset>;
+		reset-gpios = <&gpio5 19 GPIO_ACTIVE_LOW>;	/* gpio_147 */
 		vcc-supply = <&hsusb2_power>;
 	};