| Message ID | 20240628140104.551760-1-amadeus@jmu.edu.cn (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] arm64: dts: rockchip: fix regulator and supply for Lunzn Fastrhino R6xS | expand |
Hi, Am Freitag, 28. Juni 2024, 16:01:00 CEST schrieb Chukun Pan: > Make the regulator name and supply the same as those marked by schematics. > > Fixes: c79dab407afd ("arm64: dts: rockchip: Add Lunzn Fastrhino R66S") > Fixes: b9f8ca655d80 ("arm64: dts: rockchip: Add Lunzn Fastrhino R68S") > Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> this needs to be split more please. Separate commits with more verbose commit messages for: - regulator renames - the pmu-io-domain changes - why is moving vccio3-supply moving to the boards - fixing usb regulators - vcc5v0_usb_host probably because that regulator does not exist at all? > --- > .../dts/rockchip/rk3568-fastrhino-r66s.dts | 4 +++ > .../dts/rockchip/rk3568-fastrhino-r66s.dtsi | 28 +++++++------------ > .../dts/rockchip/rk3568-fastrhino-r68s.dts | 4 +++ > 3 files changed, 18 insertions(+), 18 deletions(-) > > diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts > index 58ab7e9971db..b5e67990dd0f 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts > @@ -11,6 +11,10 @@ aliases { > }; > }; > > +&pmu_io_domains { > + vccio3-supply = <&vccio_sd>; > +}; > + > &sdmmc0 { > bus-width = <4>; > cap-mmc-highspeed; > diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi > index 89e84e3a9262..82577eba31eb 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi > +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi > @@ -39,9 +39,9 @@ status_led: led-status { > }; > }; > > - dc_12v: dc-12v-regulator { > + vcc12v_dcin: vcc12v-dcin-regulator { > compatible = "regulator-fixed"; > - regulator-name = "dc_12v"; > + regulator-name = "vcc12v_dcin"; > regulator-always-on; > regulator-boot-on; > regulator-min-microvolt = <12000000>; > @@ -65,7 +65,7 @@ vcc3v3_sys: vcc3v3-sys-regulator { > regulator-boot-on; > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > - vin-supply = <&dc_12v>; > + vin-supply = <&vcc12v_dcin>; > }; > > vcc5v0_sys: vcc5v0-sys-regulator { > @@ -75,16 +75,7 @@ vcc5v0_sys: vcc5v0-sys-regulator { > regulator-boot-on; > regulator-min-microvolt = <5000000>; > regulator-max-microvolt = <5000000>; > - vin-supply = <&dc_12v>; > - }; > - > - vcc5v0_usb_host: vcc5v0-usb-host-regulator { > - compatible = "regulator-fixed"; > - regulator-name = "vcc5v0_usb_host"; > - regulator-always-on; > - regulator-boot-on; > - regulator-min-microvolt = <5000000>; > - regulator-max-microvolt = <5000000>; > + vin-supply = <&vcc12v_dcin>; > }; > > vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { > @@ -94,8 +85,9 @@ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { > pinctrl-names = "default"; > pinctrl-0 = <&vcc5v0_usb_otg_en>; > regulator-name = "vcc5v0_usb_otg"; > - regulator-always-on; > - regulator-boot-on; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + vin-supply = <&vcc5v0_sys>; > }; > }; > > @@ -405,8 +397,8 @@ vcc5v0_usb_otg_en: vcc5v0-usb-otg-en { > &pmu_io_domains { > pmuio1-supply = <&vcc3v3_pmu>; > pmuio2-supply = <&vcc3v3_pmu>; > - vccio1-supply = <&vccio_acodec>; > - vccio3-supply = <&vccio_sd>; > + vccio1-supply = <&vcc_3v3>; > + vccio2-supply = <&vcc_1v8>; > vccio4-supply = <&vcc_1v8>; > vccio5-supply = <&vcc_3v3>; > vccio6-supply = <&vcc_1v8>; > @@ -460,7 +452,7 @@ &usb2phy0 { > }; > > &usb2phy0_host { > - phy-supply = <&vcc5v0_usb_host>; > + phy-supply = <&vcc5v0_sys>; > status = "okay"; > }; > > diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts > index e1fe5e442689..a3339186e89c 100644 > --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts > +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts > @@ -102,6 +102,10 @@ eth_phy1_reset_pin: eth-phy1-reset-pin { > }; > }; > > +&pmu_io_domains { > + vccio3-supply = <&vcc_3v3>; > +}; > + > &sdhci { > bus-width = <8>; > max-frequency = <200000000>; >
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts index 58ab7e9971db..b5e67990dd0f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dts @@ -11,6 +11,10 @@ aliases { }; }; +&pmu_io_domains { + vccio3-supply = <&vccio_sd>; +}; + &sdmmc0 { bus-width = <4>; cap-mmc-highspeed; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi index 89e84e3a9262..82577eba31eb 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r66s.dtsi @@ -39,9 +39,9 @@ status_led: led-status { }; }; - dc_12v: dc-12v-regulator { + vcc12v_dcin: vcc12v-dcin-regulator { compatible = "regulator-fixed"; - regulator-name = "dc_12v"; + regulator-name = "vcc12v_dcin"; regulator-always-on; regulator-boot-on; regulator-min-microvolt = <12000000>; @@ -65,7 +65,7 @@ vcc3v3_sys: vcc3v3-sys-regulator { regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; - vin-supply = <&dc_12v>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_sys: vcc5v0-sys-regulator { @@ -75,16 +75,7 @@ vcc5v0_sys: vcc5v0-sys-regulator { regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - vin-supply = <&dc_12v>; - }; - - vcc5v0_usb_host: vcc5v0-usb-host-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_usb_host"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; + vin-supply = <&vcc12v_dcin>; }; vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { @@ -94,8 +85,9 @@ vcc5v0_usb_otg: vcc5v0-usb-otg-regulator { pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_usb_otg_en>; regulator-name = "vcc5v0_usb_otg"; - regulator-always-on; - regulator-boot-on; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&vcc5v0_sys>; }; }; @@ -405,8 +397,8 @@ vcc5v0_usb_otg_en: vcc5v0-usb-otg-en { &pmu_io_domains { pmuio1-supply = <&vcc3v3_pmu>; pmuio2-supply = <&vcc3v3_pmu>; - vccio1-supply = <&vccio_acodec>; - vccio3-supply = <&vccio_sd>; + vccio1-supply = <&vcc_3v3>; + vccio2-supply = <&vcc_1v8>; vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; vccio6-supply = <&vcc_1v8>; @@ -460,7 +452,7 @@ &usb2phy0 { }; &usb2phy0_host { - phy-supply = <&vcc5v0_usb_host>; + phy-supply = <&vcc5v0_sys>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts index e1fe5e442689..a3339186e89c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-fastrhino-r68s.dts @@ -102,6 +102,10 @@ eth_phy1_reset_pin: eth-phy1-reset-pin { }; }; +&pmu_io_domains { + vccio3-supply = <&vcc_3v3>; +}; + &sdhci { bus-width = <8>; max-frequency = <200000000>;
Make the regulator name and supply the same as those marked by schematics. Fixes: c79dab407afd ("arm64: dts: rockchip: Add Lunzn Fastrhino R66S") Fixes: b9f8ca655d80 ("arm64: dts: rockchip: Add Lunzn Fastrhino R68S") Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn> --- .../dts/rockchip/rk3568-fastrhino-r66s.dts | 4 +++ .../dts/rockchip/rk3568-fastrhino-r66s.dtsi | 28 +++++++------------ .../dts/rockchip/rk3568-fastrhino-r68s.dts | 4 +++ 3 files changed, 18 insertions(+), 18 deletions(-)