| Message ID | 20200120091526.99806-1-pbrobinson@gmail.com |
|---|---|
| State | Accepted |
| Commit | 4d08de5840573bde8c36cb4e4c5f39af46fe1c40 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | arm: dts: rockchip: Update EVB/Puma devices to upstream USB/dwc3 conventions | expand |
On 2020/1/20 下午5:15, Peter Robinson wrote: > The upstream linux kernel for the Rockchip 3399 SoC use usbdrd3 naming so move > the two remaining devices over to that for their device trees to make it > easier to sync with upstream DTs. > > Signed-off-by: Peter Robinson <pbrobinson@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3399-evb.dts | 4 ++-- > arch/arm/dts/rk3399-puma.dtsi | 4 ++-- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts > index 8e887f3a17..4129e902a8 100644 > --- a/arch/arm/dts/rk3399-evb.dts > +++ b/arch/arm/dts/rk3399-evb.dts > @@ -176,7 +176,7 @@ > status = "okay"; > }; > > -&dwc3_typec0 { > +&usbdrd3_0 { > vbus-supply = <&vcc5v0_typec0>; > status = "okay"; > }; > @@ -189,7 +189,7 @@ > status = "okay"; > }; > > -&dwc3_typec1 { > +&usbdrd3_1 { > vbus-supply = <&vcc5v0_typec1>; > status = "okay"; > }; > diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi > index 74368da550..aae9998871 100644 > --- a/arch/arm/dts/rk3399-puma.dtsi > +++ b/arch/arm/dts/rk3399-puma.dtsi > @@ -518,7 +518,7 @@ > status = "disabled"; > }; > > -&dwc3_typec0 { > +&usbdrd3_0 { > status = "okay"; > }; > > @@ -530,7 +530,7 @@ > status = "disabled"; > }; > > -&dwc3_typec1 { > +&usbdrd3_1 { > status = "okay"; > tsd,usb-port-power = "usbhub_enable"; > };
diff --git a/arch/arm/dts/rk3399-evb.dts b/arch/arm/dts/rk3399-evb.dts index 8e887f3a17..4129e902a8 100644 --- a/arch/arm/dts/rk3399-evb.dts +++ b/arch/arm/dts/rk3399-evb.dts @@ -176,7 +176,7 @@ status = "okay"; }; -&dwc3_typec0 { +&usbdrd3_0 { vbus-supply = <&vcc5v0_typec0>; status = "okay"; }; @@ -189,7 +189,7 @@ status = "okay"; }; -&dwc3_typec1 { +&usbdrd3_1 { vbus-supply = <&vcc5v0_typec1>; status = "okay"; }; diff --git a/arch/arm/dts/rk3399-puma.dtsi b/arch/arm/dts/rk3399-puma.dtsi index 74368da550..aae9998871 100644 --- a/arch/arm/dts/rk3399-puma.dtsi +++ b/arch/arm/dts/rk3399-puma.dtsi @@ -518,7 +518,7 @@ status = "disabled"; }; -&dwc3_typec0 { +&usbdrd3_0 { status = "okay"; }; @@ -530,7 +530,7 @@ status = "disabled"; }; -&dwc3_typec1 { +&usbdrd3_1 { status = "okay"; tsd,usb-port-power = "usbhub_enable"; };
The upstream linux kernel for the Rockchip 3399 SoC use usbdrd3 naming so move the two remaining devices over to that for their device trees to make it easier to sync with upstream DTs. Signed-off-by: Peter Robinson <pbrobinson@gmail.com> --- arch/arm/dts/rk3399-evb.dts | 4 ++-- arch/arm/dts/rk3399-puma.dtsi | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)