arm64: dts: rockchip: fix regulator name on rk3399-rock-4

[ 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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

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 8b70e831aff2322ff9a16b926b6d07773d8005c3..203460d46f182924d3084880e3910c30e6c39073 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
@@ -98,24 +98,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 {
@@ -162,7 +163,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>;
@@ -267,8 +268,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>;
@@ -278,8 +279,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>;
@@ -336,8 +337,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>;
@@ -456,7 +457,7 @@
        status = "okay";
 
        bt656-supply = <&vcc_3v0>;
-       audio-supply = <&vcc1v8_codec>;
+       audio-supply = <&vcca1v8_codec>;
        sdmmc-supply = <&vcc_sdio>;
        gpio1830-supply = <&vcc_3v0>;
 };