| @@ -1,19 +1,8 @@
-From 60d8aedea7c8c390ee744730ab3e565ea84496fb Mon Sep 17 00:00:00 2001
-From: Danct12 <danct12@disroot.org>
-Date: Fri, 10 Dec 2021 23:01:34 +0700
-Subject: [PATCH] arm64: dts: rk3399-pinephone-pro: Remove modem node
-
-Since we don't use modem-power driver, this can be removed
-for eg25-manager.
----
- .../dts/rockchip/rk3399-pinephone-pro.dts | 40 +------------------
- 1 file changed, 2 insertions(+), 38 deletions(-)
-
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
-index 61c990764..13141c643 100644
+index 41738a73a7e9..a63aa9d80709 100644
--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts
-@@ -326,6 +326,7 @@ vcc_4g_5v: vcc-4g-5v {
+@@ -407,6 +407,7 @@ vcc_4g_5v: vcc-4g-5v {
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vin-supply = <&vcc5v0_sys>;
@@ -21,15 +10,15 @@
};
vcc_4g: vcc-4g {
-@@ -338,6 +339,7 @@ vcc_4g: vcc-4g {
+@@ -419,6 +420,7 @@ vcc_4g: vcc-4g {
regulator-min-microvolt = <3800000>;
regulator-max-microvolt = <3800000>;
vin-supply = <&vcc_sys>;
+ regulator-always-on;
};
- vcc1v8_codec: vcc1v8-codec-regulator {
-@@ -1058,31 +1060,6 @@ mipi_in_panel: endpoint {
+ // XXX: modem codec supplies:
+@@ -1251,31 +1253,6 @@ mipi_in_panel: endpoint {
&uart3 {
status = "okay";
@@ -56,12 +45,12 @@
- cts-gpios = <&gpio3 RK_PC0 GPIO_ACTIVE_HIGH>;
- rts-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
-
-- quectel,qdai = "3,0,0,4,0,0,1,1";
+- quectel,qdai = "3,0,0,4,0,1,1,1";
- };
};
&pmu_io_domains {
-@@ -1153,19 +1130,6 @@ vcc_4g_5v_en: vcc-4g-5v-en-pin {
+@@ -1356,19 +1333,6 @@ vcc_4g_5v_en: vcc-4g-5v-en-pin {
vcc_4g_en: vcc-4g-en-pin {
rockchip,pins = <4 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
};
@@ -81,6 +70,3 @@
};
pmic {
---
-2.34.1
-
|
