| Message ID | 20200327044130.8763-2-wens@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | rockchip: rk3328: sync dts and add ROC-RK3328-CC board | expand |
Hi ChenYu, On 2020/3/27 ??12:41, Chen-Yu Tsai wrote: > From: Chen-Yu Tsai <wens at csie.org> > > USB 3.0 is only supported in U-boot, not in the Linux kernel where the > device tree files are ultimately synced from. While the xhci node was > moved, the external vbus regulator was not. > > Move it as well. > > Fixes: 2e91e2025c1b ("rockchip: rk3328: migrate u-boot node to -u-boot.dtsi") > Signed-off-by: Chen-Yu Tsai <wens at csie.org> Reviewed-by: Kever Yang <kever.yang at rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3328-evb-u-boot.dtsi | 11 +++++++++++ > arch/arm/dts/rk3328-evb.dts | 9 --------- > 2 files changed, 11 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi > index 4a827063c555..5679897279aa 100644 > --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi > +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi > @@ -6,6 +6,17 @@ > #include "rk3328-u-boot.dtsi" > #include "rk3328-sdram-ddr3-666.dtsi" > > +/{ > + vcc5v0_host_xhci: vcc5v0-host-xhci-drv { > + compatible = "regulator-fixed"; > + enable-active-high; > + gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>; > + regulator-name = "vcc5v0_host_xhci"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + }; > +}; > + > &usb_host0_xhci { > vbus-supply = <&vcc5v0_host_xhci>; > status = "okay"; > diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts > index a2ee838fcd6b..e9bc849f8c23 100644 > --- a/arch/arm/dts/rk3328-evb.dts > +++ b/arch/arm/dts/rk3328-evb.dts > @@ -38,15 +38,6 @@ > regulator-max-microvolt = <5000000>; > }; > > - vcc5v0_host_xhci: vcc5v0-host-xhci-drv { > - compatible = "regulator-fixed"; > - enable-active-high; > - regulator-name = "vcc5v0_host_xhci"; > - gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > - }; > - > vcc_phy: vcc-phy-regulator { > compatible = "regulator-fixed"; > regulator-name = "vcc_phy";
diff --git a/arch/arm/dts/rk3328-evb-u-boot.dtsi b/arch/arm/dts/rk3328-evb-u-boot.dtsi index 4a827063c555..5679897279aa 100644 --- a/arch/arm/dts/rk3328-evb-u-boot.dtsi +++ b/arch/arm/dts/rk3328-evb-u-boot.dtsi @@ -6,6 +6,17 @@ #include "rk3328-u-boot.dtsi" #include "rk3328-sdram-ddr3-666.dtsi" +/{ + vcc5v0_host_xhci: vcc5v0-host-xhci-drv { + compatible = "regulator-fixed"; + enable-active-high; + gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>; + regulator-name = "vcc5v0_host_xhci"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + }; +}; + &usb_host0_xhci { vbus-supply = <&vcc5v0_host_xhci>; status = "okay"; diff --git a/arch/arm/dts/rk3328-evb.dts b/arch/arm/dts/rk3328-evb.dts index a2ee838fcd6b..e9bc849f8c23 100644 --- a/arch/arm/dts/rk3328-evb.dts +++ b/arch/arm/dts/rk3328-evb.dts @@ -38,15 +38,6 @@ regulator-max-microvolt = <5000000>; }; - vcc5v0_host_xhci: vcc5v0-host-xhci-drv { - compatible = "regulator-fixed"; - enable-active-high; - regulator-name = "vcc5v0_host_xhci"; - gpio = <&gpio0 0 GPIO_ACTIVE_HIGH>; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - }; - vcc_phy: vcc-phy-regulator { compatible = "regulator-fixed"; regulator-name = "vcc_phy";