diff mbox series

[v2] arm: dts: rockchip: fix vcc_host_5v regulator for usb3 host

Message ID 20190815081252.27405-1-kever.yang@rock-chips.com (mailing list archive)
State New, archived
Headers show
Series [v2] arm: dts: rockchip: fix vcc_host_5v regulator for usb3 host | expand

Commit Message

Kever Yang Aug. 15, 2019, 8:12 a.m. UTC
According to rock64 schemetic V2 and V3, the VCC_HOST_5V output is
controlled by USB_20_HOST_DRV, which is the same as VCC_HOST1_5V.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
---

Changes in v2:
- remove enable-active-high property

 arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

Comments

Heiko Stuebner Aug. 16, 2019, 12:24 p.m. UTC | #1
Hi Kever, TL,

[added TL Lim for clarification]

Am Donnerstag, 15. August 2019, 10:12:52 CEST schrieb Kever Yang:
> According to rock64 schemetic V2 and V3, the VCC_HOST_5V output is
> controlled by USB_20_HOST_DRV, which is the same as VCC_HOST1_5V.

The v1 schematics I have do reference the GPIO0_A0 as controlling this
supply, so the big question would be how to handle the different versions.

Because adding this would probably break v1 boards in this function.

@TL: where v1 boards also sold or were they only used during development?
If this were the case, we could just apply the patch, not caring about
v1 boards, but if v1 boards were also sold to customers there would be
more of a problem.

Thanks
Heiko


> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> ---
> 
> Changes in v2:
> - remove enable-active-high property
> 
>  arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
> index 7cfd5ca6cc85..62936b432f9a 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
> @@ -34,10 +34,9 @@
>  
>  	vcc_host_5v: vcc-host-5v-regulator {
>  		compatible = "regulator-fixed";
> -		enable-active-high;
> -		gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
> +		gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
>  		pinctrl-names = "default";
> -		pinctrl-0 = <&usb30_host_drv>;
> +		pinctrl-0 = <&usb20_host_drv>;
>  		regulator-name = "vcc_host_5v";
>  		regulator-always-on;
>  		regulator-boot-on;
> @@ -320,12 +319,6 @@
>  			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
>  		};
>  	};
> -
> -	usb3 {
> -		usb30_host_drv: usb30-host-drv {
> -			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
> -		};
> -	};
>  };
>  
>  &sdmmc {
>
Kever Yang Aug. 19, 2019, 12:29 a.m. UTC | #2
Hi Heiko,

On 2019/8/16 下午8:24, Heiko Stuebner wrote:
> Hi Kever, TL,
>
> [added TL Lim for clarification]
>
> Am Donnerstag, 15. August 2019, 10:12:52 CEST schrieb Kever Yang:
>> According to rock64 schemetic V2 and V3, the VCC_HOST_5V output is
>> controlled by USB_20_HOST_DRV, which is the same as VCC_HOST1_5V.
> The v1 schematics I have do reference the GPIO0_A0 as controlling this
> supply, so the big question would be how to handle the different versions.
>
> Because adding this would probably break v1 boards in this function.
>
> @TL: where v1 boards also sold or were they only used during development?


I have check this with TL when I make this patch, the V1 hardware was 
never sold and only V2/V3

are available on the market.


Thanks,

- Kever

> If this were the case, we could just apply the patch, not caring about
> v1 boards, but if v1 boards were also sold to customers there would be
> more of a problem.
>
> Thanks
> Heiko
>
>
>> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
>> ---
>>
>> Changes in v2:
>> - remove enable-active-high property
>>
>>   arch/arm64/boot/dts/rockchip/rk3328-rock64.dts | 11 ++---------
>>   1 file changed, 2 insertions(+), 9 deletions(-)
>>
>> diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
>> index 7cfd5ca6cc85..62936b432f9a 100644
>> --- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
>> +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
>> @@ -34,10 +34,9 @@
>>   
>>   	vcc_host_5v: vcc-host-5v-regulator {
>>   		compatible = "regulator-fixed";
>> -		enable-active-high;
>> -		gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
>> +		gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
>>   		pinctrl-names = "default";
>> -		pinctrl-0 = <&usb30_host_drv>;
>> +		pinctrl-0 = <&usb20_host_drv>;
>>   		regulator-name = "vcc_host_5v";
>>   		regulator-always-on;
>>   		regulator-boot-on;
>> @@ -320,12 +319,6 @@
>>   			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
>>   		};
>>   	};
>> -
>> -	usb3 {
>> -		usb30_host_drv: usb30-host-drv {
>> -			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
>> -		};
>> -	};
>>   };
>>   
>>   &sdmmc {
>>
>
>
>
>
Heiko Stuebner Aug. 19, 2019, 2:43 p.m. UTC | #3
Hi Kever,

Am Montag, 19. August 2019, 02:29:31 CEST schrieb Kever Yang:
> Hi Heiko,
> 
> On 2019/8/16 下午8:24, Heiko Stuebner wrote:
> > Hi Kever, TL,
> >
> > [added TL Lim for clarification]
> >
> > Am Donnerstag, 15. August 2019, 10:12:52 CEST schrieb Kever Yang:
> >> According to rock64 schemetic V2 and V3, the VCC_HOST_5V output is
> >> controlled by USB_20_HOST_DRV, which is the same as VCC_HOST1_5V.
> > The v1 schematics I have do reference the GPIO0_A0 as controlling this
> > supply, so the big question would be how to handle the different versions.
> >
> > Because adding this would probably break v1 boards in this function.
> >
> > @TL: where v1 boards also sold or were they only used during development?
> 
> 
> I have check this with TL when I make this patch, the V1 hardware was 
> never sold and only V2/V3
> 
> are available on the market.

Thanks for clearing this up. I've applied this patch for 5.4 now.

Thanks
Heiko
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
index 7cfd5ca6cc85..62936b432f9a 100644
--- a/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
@@ -34,10 +34,9 @@ 
 
 	vcc_host_5v: vcc-host-5v-regulator {
 		compatible = "regulator-fixed";
-		enable-active-high;
-		gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>;
 		pinctrl-names = "default";
-		pinctrl-0 = <&usb30_host_drv>;
+		pinctrl-0 = <&usb20_host_drv>;
 		regulator-name = "vcc_host_5v";
 		regulator-always-on;
 		regulator-boot-on;
@@ -320,12 +319,6 @@ 
 			rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
 		};
 	};
-
-	usb3 {
-		usb30_host_drv: usb30-host-drv {
-			rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
-		};
-	};
 };
 
 &sdmmc {