mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-23 21:39:02 +00:00
87 lines
No EOL
2.1 KiB
Diff
Executable file
87 lines
No EOL
2.1 KiB
Diff
Executable file
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
|
|
index efafc680a..9c2cfc428 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dts
|
|
@@ -53,20 +53,6 @@
|
|
regulator-max-microvolt = <5000000>;
|
|
};
|
|
|
|
- /*
|
|
- * should be placed inside mp8859, but not until mp8859 has
|
|
- * its own dt-binding.
|
|
- */
|
|
- vcc12v_sys: mp8859-dcdc1 {
|
|
- compatible = "regulator-fixed";
|
|
- regulator-name = "vcc12v_sys";
|
|
- regulator-always-on;
|
|
- regulator-boot-on;
|
|
- regulator-min-microvolt = <12000000>;
|
|
- regulator-max-microvolt = <12000000>;
|
|
- vin-supply = <&vcc_vbus_typec0>;
|
|
- };
|
|
-
|
|
/* switched by pmic_sleep */
|
|
vcc1v8_s3: vcca1v8_s3: vcc1v8-s3 {
|
|
compatible = "regulator-fixed";
|
|
@@ -85,7 +71,7 @@
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
- vin-supply = <&vcc12v_sys>;
|
|
+ vin-supply = <&dc_12v>;
|
|
};
|
|
vcca_0v9: vcca-0v9 {
|
|
compatible = "regulator-fixed";
|
|
@@ -131,7 +117,7 @@
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <5000000>;
|
|
regulator-max-microvolt = <5000000>;
|
|
- vin-supply = <&vcc12v_sys>;
|
|
+ vin-supply = <&dc_12v>;
|
|
};
|
|
|
|
vdd_log: vdd-log {
|
|
@@ -156,7 +142,7 @@
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
- vin-supply = <&vcc12v_sys>;
|
|
+ vin-supply = <&dc_12v>;
|
|
};
|
|
|
|
vcc3v3_pcie: vcc3v3-pcie {
|
|
@@ -170,7 +156,7 @@
|
|
regulator-boot-on;
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
- vin-supply = <&vcc12v_sys>;
|
|
+ vin-supply = <&dc_12v>;
|
|
};
|
|
};
|
|
|
|
@@ -501,6 +487,25 @@
|
|
vbus-supply = <&vcc_vbus_typec0>;
|
|
status = "okay";
|
|
};
|
|
+
|
|
+ mp8859: regulator@66 {
|
|
+ compatible = "mps,mp8859";
|
|
+ reg = <0x66>;
|
|
+ dc_12v: mp8859_dcdc {
|
|
+ regulator-name = "dc_12v";
|
|
+ regulator-min-microvolt = <12000000>;
|
|
+ regulator-max-microvolt = <12000000>;
|
|
+ regulator-always-on;
|
|
+ regulator-boot-on;
|
|
+ vin-supply = <&vcc_vbus_typec0>;
|
|
+
|
|
+ regulator-state-mem {
|
|
+ regulator-on-in-suspend;
|
|
+ regulator-suspend-microvolt = <12000000>;
|
|
+ };
|
|
+ };
|
|
+ };
|
|
+
|
|
};
|
|
|
|
&i2s0 {
|