Commit 12d98bfc authored by FUKAUMI Naoki's avatar FUKAUMI Naoki Committed by sanglipeng
Browse files

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

stable inclusion
from stable-v5.10.192
commit 7ba9ac0b5a90ea3838bdb537dc3ec7d725aa0e74
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I933RF

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7ba9ac0b5a90ea3838bdb537dc3ec7d725aa0e74

--------------------------------

[ Upstream commit 69448624 ]

fix regulator name

ref:
 https://dl.radxa.com/rockpi4/docs/hw/rockpi4/rockpi4_v13_sch_20181112.pdf



Signed-off-by: default avatarFUKAUMI Naoki <naoki@radxa.com>
Link: https://lore.kernel.org/r/20220909195006.127957-4-naoki@radxa.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Stable-dep-of: cee57275 ("arm64: dts: rockchip: Disable HS400 for eMMC on ROCK Pi 4")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent e7578a43

arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi

+13 −12
Original line number Diff line number Diff line
@@ -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>;

};