| From fe253c5c2d42bfcf0c7588f5d2e14c4dfb31ff6c Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Fri, 9 Sep 2022 19:50:04 +0000 |
| Subject: arm64: dts: rockchip: fix regulator name on rk3399-rock-4 |
| |
| From: FUKAUMI Naoki <naoki@radxa.com> |
| |
| [ Upstream commit 69448624b770aa88a71536a16900dd3cc6002919 ] |
| |
| fix regulator name |
| |
| ref: |
| https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi4_v13_sch_20181112.pdf |
| |
| Signed-off-by: FUKAUMI Naoki <naoki@radxa.com> |
| Link: https://lore.kernel.org/r/20220909195006.127957-4-naoki@radxa.com |
| Signed-off-by: Heiko Stuebner <heiko@sntech.de> |
| Stable-dep-of: cee572756aa2 ("arm64: dts: rockchip: Disable HS400 for eMMC on ROCK Pi 4") |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| .../boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 25 ++++++++++--------- |
| 1 file changed, 13 insertions(+), 12 deletions(-) |
| |
| diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi |
| index fcd8eeabf53b6..4e1c1f970aba1 100644 |
| --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi |
| +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi |
| @@ -116,24 +116,25 @@ |
| vin-supply = <&vcc5v0_sys>; |
| }; |
| |
| - vcc5v0_typec: vcc5v0-typec-regulator { |
| + vbus_typec: vbus-typec-regulator { |
| compatible = "regulator-fixed"; |
| enable-active-high; |
| gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>; |
| pinctrl-names = "default"; |
| pinctrl-0 = <&vcc5v0_typec_en>; |
| - regulator-name = "vcc5v0_typec"; |
| + regulator-name = "vbus_typec"; |
| regulator-always-on; |
| vin-supply = <&vcc5v0_sys>; |
| }; |
| |
| - vcc_lan: vcc3v3-phy-regulator { |
| + vcc3v3_lan: vcc3v3-lan-regulator { |
| compatible = "regulator-fixed"; |
| - regulator-name = "vcc_lan"; |
| + regulator-name = "vcc3v3_lan"; |
| regulator-always-on; |
| regulator-boot-on; |
| regulator-min-microvolt = <3300000>; |
| regulator-max-microvolt = <3300000>; |
| + vin-supply = <&vcc3v3_sys>; |
| }; |
| |
| vdd_log: vdd-log { |
| @@ -180,7 +181,7 @@ |
| assigned-clocks = <&cru SCLK_RMII_SRC>; |
| assigned-clock-parents = <&clkin_gmac>; |
| clock_in_out = "input"; |
| - phy-supply = <&vcc_lan>; |
| + phy-supply = <&vcc3v3_lan>; |
| phy-mode = "rgmii"; |
| pinctrl-names = "default"; |
| pinctrl-0 = <&rgmii_pins>; |
| @@ -285,8 +286,8 @@ |
| }; |
| }; |
| |
| - vcc1v8_codec: LDO_REG1 { |
| - regulator-name = "vcc1v8_codec"; |
| + vcca1v8_codec: LDO_REG1 { |
| + regulator-name = "vcca1v8_codec"; |
| regulator-always-on; |
| regulator-boot-on; |
| regulator-min-microvolt = <1800000>; |
| @@ -296,8 +297,8 @@ |
| }; |
| }; |
| |
| - vcc1v8_hdmi: LDO_REG2 { |
| - regulator-name = "vcc1v8_hdmi"; |
| + vcca1v8_hdmi: LDO_REG2 { |
| + regulator-name = "vcca1v8_hdmi"; |
| regulator-always-on; |
| regulator-boot-on; |
| regulator-min-microvolt = <1800000>; |
| @@ -354,8 +355,8 @@ |
| }; |
| }; |
| |
| - vcc0v9_hdmi: LDO_REG7 { |
| - regulator-name = "vcc0v9_hdmi"; |
| + vcca0v9_hdmi: LDO_REG7 { |
| + regulator-name = "vcca0v9_hdmi"; |
| regulator-always-on; |
| regulator-boot-on; |
| regulator-min-microvolt = <900000>; |
| @@ -495,7 +496,7 @@ |
| status = "okay"; |
| |
| bt656-supply = <&vcc_3v0>; |
| - audio-supply = <&vcc1v8_codec>; |
| + audio-supply = <&vcca1v8_codec>; |
| sdmmc-supply = <&vcc_sdio>; |
| gpio1830-supply = <&vcc_3v0>; |
| }; |
| -- |
| 2.40.1 |
| |
