| Message ID | 20231010182738.31929-1-matwey.kornilov@gmail.com |
|---|---|
| State | Accepted |
| Commit | ad84cc8678ea7da61227f46095306aeb4720e8b5 |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | rockchip: dts: rk3328: Sync rock64 device tree file from Linux | expand |
On 2023/10/11 02:27, Matwey V. Kornilov wrote: > Sync the rk3328-rock64 dts from v6.6-rc5. > > See Linux kernel commit for details: > > 03633c4ef1fb ("arm64: dts: rockchip: fix USB regulator on ROCK64") > > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> Reviewed-by: Kever Yang <kever.yang@rock-chips.com> Thanks, - Kever > --- > arch/arm/dts/rk3328-rock64.dts | 14 ++------------ > 1 file changed, 2 insertions(+), 12 deletions(-) > > diff --git a/arch/arm/dts/rk3328-rock64.dts b/arch/arm/dts/rk3328-rock64.dts > index f69a38f42d..0a27fa5271 100644 > --- a/arch/arm/dts/rk3328-rock64.dts > +++ b/arch/arm/dts/rk3328-rock64.dts > @@ -37,7 +37,8 @@ > vin-supply = <&vcc_io>; > }; > > - vcc_host_5v: vcc-host-5v-regulator { > + /* Common enable line for all of the rails mentioned in the labels */ > + vcc_host_5v: vcc_host1_5v: vcc_otg_5v: vcc-host-5v-regulator { > compatible = "regulator-fixed"; > gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; > pinctrl-names = "default"; > @@ -48,17 +49,6 @@ > vin-supply = <&vcc_sys>; > }; > > - vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { > - compatible = "regulator-fixed"; > - gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; > - pinctrl-names = "default"; > - pinctrl-0 = <&usb20_host_drv>; > - regulator-name = "vcc_host1_5v"; > - regulator-always-on; > - regulator-boot-on; > - vin-supply = <&vcc_sys>; > - }; > - > vcc_sys: vcc-sys { > compatible = "regulator-fixed"; > regulator-name = "vcc_sys";
diff --git a/arch/arm/dts/rk3328-rock64.dts b/arch/arm/dts/rk3328-rock64.dts index f69a38f42d..0a27fa5271 100644 --- a/arch/arm/dts/rk3328-rock64.dts +++ b/arch/arm/dts/rk3328-rock64.dts @@ -37,7 +37,8 @@ vin-supply = <&vcc_io>; }; - vcc_host_5v: vcc-host-5v-regulator { + /* Common enable line for all of the rails mentioned in the labels */ + vcc_host_5v: vcc_host1_5v: vcc_otg_5v: vcc-host-5v-regulator { compatible = "regulator-fixed"; gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; pinctrl-names = "default"; @@ -48,17 +49,6 @@ vin-supply = <&vcc_sys>; }; - vcc_host1_5v: vcc_otg_5v: vcc-host1-5v-regulator { - compatible = "regulator-fixed"; - gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; - pinctrl-names = "default"; - pinctrl-0 = <&usb20_host_drv>; - regulator-name = "vcc_host1_5v"; - regulator-always-on; - regulator-boot-on; - vin-supply = <&vcc_sys>; - }; - vcc_sys: vcc-sys { compatible = "regulator-fixed"; regulator-name = "vcc_sys";
Sync the rk3328-rock64 dts from v6.6-rc5. See Linux kernel commit for details: 03633c4ef1fb ("arm64: dts: rockchip: fix USB regulator on ROCK64") Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/dts/rk3328-rock64.dts | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)