Skip to contentSkip to conversation

arm: dts: rk3399-roc-pc: Sync latest dts changes from Linux

PATCH New Jagan Teki 2 participants 3 messages Oct 16, 2019 – Nov 18, 2019 Arm (32-bit)

lore
Share & tools
lore

Jagan Teki

author
#0 lore raw

PATCH 1/1 arm: dts: rk3399-roc-pc: Sync latest dts changes from Linux

Few important regulator power rails fixes are available in linux-next, so sync them same.

Here is the last commit details:
commit <9f7f9b610e1b7d2dc86c543ab0dfcf781bd42326> ("arm64: dts:
rockchip: Fix roc-rk3399-pc regulator input rails")

---
 arch/arm/dts/rk3399-roc-pc.dts | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)
arch/arm/dts/rk3399-roc-pc.dts +16 -16
index 19f7732d72..257543d069 100644
@@ -57,9 +57,9 @@
 	 * should be placed inside mp8859, but not until mp8859 has
 	 * its own dt-binding.
 	 */
-	vcc12v_sys: mp8859-dcdc1 {
+	dc_12v: mp8859-dcdc1 {
 		compatible = "regulator-fixed";
-		regulator-name = "vcc12v_sys";
+		regulator-name = "dc_12v";
 		regulator-always-on;
 		regulator-boot-on;
 		regulator-min-microvolt = <12000000>;
@@ -85,7 +85,7 @@
 		regulator-boot-on;
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vcc12v_sys>;
+		vin-supply = <&vcc_sys>;
 	};
 
 	/* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
@@ -118,7 +118,7 @@
 		regulator-boot-on;
 		regulator-min-microvolt = <5000000>;
 		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc12v_sys>;
+		vin-supply = <&dc_12v>;
 	};
 
 	vdd_log: vdd-log {
@@ -129,7 +129,7 @@
 		regulator-boot-on;
 		regulator-min-microvolt = <800000>;
 		regulator-max-microvolt = <1400000>;
-		vin-supply = <&vcc3v3_sys>;
+		vin-supply = <&vcc_sys>;
 	};
 };
 
@@ -202,16 +202,16 @@
 		rockchip,system-power-controller;
 		wakeup-source;
 
-		vcc1-supply = <&vcc3v3_sys>;
-		vcc2-supply = <&vcc3v3_sys>;
-		vcc3-supply = <&vcc3v3_sys>;
-		vcc4-supply = <&vcc3v3_sys>;
-		vcc6-supply = <&vcc3v3_sys>;
-		vcc7-supply = <&vcc3v3_sys>;
+		vcc1-supply = <&vcc_sys>;
+		vcc2-supply = <&vcc_sys>;
+		vcc3-supply = <&vcc_sys>;
+		vcc4-supply = <&vcc_sys>;
+		vcc6-supply = <&vcc_sys>;
+		vcc7-supply = <&vcc_sys>;
 		vcc8-supply = <&vcc3v3_sys>;
-		vcc9-supply = <&vcc3v3_sys>;
-		vcc10-supply = <&vcc3v3_sys>;
-		vcc11-supply = <&vcc3v3_sys>;
+		vcc9-supply = <&vcc_sys>;
+		vcc10-supply = <&vcc_sys>;
+		vcc11-supply = <&vcc_sys>;
 		vcc12-supply = <&vcc3v3_sys>;
 		vddio-supply = <&vcc1v8_pmu>;
 
@@ -385,7 +385,7 @@
 		regulator-ramp-delay = <1000>;
 		regulator-always-on;
 		regulator-boot-on;
-		vin-supply = <&vcc3v3_sys>;
+		vin-supply = <&vcc_sys>;
 
 		regulator-state-mem {
 			regulator-off-in-suspend;
@@ -404,7 +404,7 @@
 		regulator-ramp-delay = <1000>;
 		regulator-always-on;
 		regulator-boot-on;
-		vin-supply = <&vcc3v3_sys>;
+		vin-supply = <&vcc_sys>;
 
 		regulator-state-mem {
 			regulator-off-in-suspend;
Signature · 1 line
2.18.0.321.gffc6fa0e3
#1 lore raw

PATCH 1/1 arm: dts: rk3399-roc-pc: Sync latest dts changes from Linux

Quoted 10 lines · Jagan Teki

Few important regulator power rails fixes are available in linux-next, so sync them same.

Here is the last commit details:
commit <9f7f9b610e1b7d2dc86c543ab0dfcf781bd42326> ("arm64: dts:
rockchip: Fix roc-rk3399-pc regulator input rails")

Thanks,

-Kever

Quoted 91 lines
---
  arch/arm/dts/rk3399-roc-pc.dts | 32 ++++++++++++++++----------------
  1 file changed, 16 insertions(+), 16 deletions(-)
arch/arm/dts/rk3399-roc-pc.dts +16 -16
index 19f7732d72..257543d069 100644
@@ -57,9 +57,9 @@
  	 * should be placed inside mp8859, but not until mp8859 has
  	 * its own dt-binding.
  	 */
-	vcc12v_sys: mp8859-dcdc1 {
+	dc_12v: mp8859-dcdc1 {
  		compatible = "regulator-fixed";
-		regulator-name = "vcc12v_sys";
+		regulator-name = "dc_12v";
  		regulator-always-on;
  		regulator-boot-on;
  		regulator-min-microvolt = <12000000>;
@@ -85,7 +85,7 @@
  		regulator-boot-on;
  		regulator-min-microvolt = <3300000>;
  		regulator-max-microvolt = <3300000>;
-		vin-supply = <&vcc12v_sys>;
+		vin-supply = <&vcc_sys>;
  	};
 
  	/* Actually 3 regulators (host0, 1, 2) controlled by the same gpio */
@@ -118,7 +118,7 @@
  		regulator-boot-on;
  		regulator-min-microvolt = <5000000>;
  		regulator-max-microvolt = <5000000>;
-		vin-supply = <&vcc12v_sys>;
+		vin-supply = <&dc_12v>;
  	};
 
  	vdd_log: vdd-log {
@@ -129,7 +129,7 @@
  		regulator-boot-on;
  		regulator-min-microvolt = <800000>;
  		regulator-max-microvolt = <1400000>;
-		vin-supply = <&vcc3v3_sys>;
+		vin-supply = <&vcc_sys>;
  	};
  };
 
@@ -202,16 +202,16 @@
  		rockchip,system-power-controller;
  		wakeup-source;
 
-		vcc1-supply = <&vcc3v3_sys>;
-		vcc2-supply = <&vcc3v3_sys>;
-		vcc3-supply = <&vcc3v3_sys>;
-		vcc4-supply = <&vcc3v3_sys>;
-		vcc6-supply = <&vcc3v3_sys>;
-		vcc7-supply = <&vcc3v3_sys>;
+		vcc1-supply = <&vcc_sys>;
+		vcc2-supply = <&vcc_sys>;
+		vcc3-supply = <&vcc_sys>;
+		vcc4-supply = <&vcc_sys>;
+		vcc6-supply = <&vcc_sys>;
+		vcc7-supply = <&vcc_sys>;
  		vcc8-supply = <&vcc3v3_sys>;
-		vcc9-supply = <&vcc3v3_sys>;
-		vcc10-supply = <&vcc3v3_sys>;
-		vcc11-supply = <&vcc3v3_sys>;
+		vcc9-supply = <&vcc_sys>;
+		vcc10-supply = <&vcc_sys>;
+		vcc11-supply = <&vcc_sys>;
  		vcc12-supply = <&vcc3v3_sys>;
  		vddio-supply = <&vcc1v8_pmu>;
 
@@ -385,7 +385,7 @@
  		regulator-ramp-delay = <1000>;
  		regulator-always-on;
  		regulator-boot-on;
-		vin-supply = <&vcc3v3_sys>;
+		vin-supply = <&vcc_sys>;
 
  		regulator-state-mem {
  			regulator-off-in-suspend;
@@ -404,7 +404,7 @@
  		regulator-ramp-delay = <1000>;
  		regulator-always-on;
  		regulator-boot-on;
-		vin-supply = <&vcc3v3_sys>;
+		vin-supply = <&vcc_sys>;
 
  		regulator-state-mem {
  			regulator-off-in-suspend;
#2 lore raw

PATCH 1/1 arm: dts: rk3399-roc-pc: Sync latest dts changes from Linux【请注意,邮件由[email protected]代发】

Quoted 9 lines · Kever Yang
Quoted 7 lines · Jagan Teki

Few important regulator power rails fixes are available in linux-next, so sync them same.

Here is the last commit details:
commit <9f7f9b610e1b7d2dc86c543ab0dfcf781bd42326> ("arm64: dts:
rockchip: Fix roc-rk3399-pc regulator input rails")

Quoted 6 lines
Quoted 3 lines

Applied to u-boot-rockchip master.

Thanks,
- Kever

Quoted 98 lines

Thanks,

-Kever

Quoted 79 lines

---
  arch/arm/dts/rk3399-roc-pc.dts | 32 ++++++++++++++++----------------

  1 file changed, 16 insertions(+), 16 deletions(-)
arch/arm/dts/rk3399-roc-pc.dts +3 -3
index 19f7732d72..257543d069 100644
@@ -57,9 +57,9 @@
        * should be placed inside mp8859, but not until mp8859 has
        * its own dt-binding.
        */
-    vcc12v_sys: mp8859-dcdc1 {
+    dc_12v: mp8859-dcdc1 {
           compatible = "regulator-fixed";
-        regulator-name = "vcc12v_sys";
+        regulator-name = "dc_12v";
           regulator-always-on;
           regulator-boot-on;
           regulator-min-microvolt = <12000000>;
@@ -85,7 +85,7 @@
           regulator-boot-on;
           regulator-min-microvolt = <3300000>;
           regulator-max-microvolt = <3300000>;
-        vin-supply = <&vcc12v_sys>;
+        vin-supply = <&vcc_sys>;
       };
         /* Actually 3 regulators (host0, 1, 2) controlled by the same 

gpio */

arch/arm/dts/rk3399-roc-pc.dts +2 -2
@@ -118,7 +118,7 @@
           regulator-boot-on;
           regulator-min-microvolt = <5000000>;
           regulator-max-microvolt = <5000000>;
-        vin-supply = <&vcc12v_sys>;
+        vin-supply = <&dc_12v>;
       };
         vdd_log: vdd-log {
@@ -129,7 +129,7 @@
           regulator-boot-on;
           regulator-min-microvolt = <800000>;
           regulator-max-microvolt = <1400000>;
-        vin-supply = <&vcc3v3_sys>;
+        vin-supply = <&vcc_sys>;
       };
   };

  @@ -202,16 +202,16 @@
          rockchip,system-power-controller;
          wakeup-source;
  -        vcc1-supply = <&vcc3v3_sys>;
-        vcc2-supply = <&vcc3v3_sys>;
-        vcc3-supply = <&vcc3v3_sys>;
-        vcc4-supply = <&vcc3v3_sys>;
-        vcc6-supply = <&vcc3v3_sys>;
-        vcc7-supply = <&vcc3v3_sys>;
+        vcc1-supply = <&vcc_sys>;
+        vcc2-supply = <&vcc_sys>;
+        vcc3-supply = <&vcc_sys>;
+        vcc4-supply = <&vcc_sys>;
+        vcc6-supply = <&vcc_sys>;
+        vcc7-supply = <&vcc_sys>;
          vcc8-supply = <&vcc3v3_sys>;
-        vcc9-supply = <&vcc3v3_sys>;
-        vcc10-supply = <&vcc3v3_sys>;
-        vcc11-supply = <&vcc3v3_sys>;
+        vcc9-supply = <&vcc_sys>;
+        vcc10-supply = <&vcc_sys>;
+        vcc11-supply = <&vcc_sys>;
          vcc12-supply = <&vcc3v3_sys>;
          vddio-supply = <&vcc1v8_pmu>;
  @@ -385,7 +385,7 @@
          regulator-ramp-delay = <1000>;
          regulator-always-on;
          regulator-boot-on;
-        vin-supply = <&vcc3v3_sys>;
+        vin-supply = <&vcc_sys>;
            regulator-state-mem {
              regulator-off-in-suspend;

arch/arm/dts/rk3399-roc-pc.dts line 409

Quoted 7 lines
arch/arm/dts/rk3399-roc-pc.dts +1 -1
@@ -404,7 +404,7 @@
           regulator-ramp-delay = <1000>;
           regulator-always-on;
           regulator-boot-on;
-        vin-supply = <&vcc3v3_sys>;
+        vin-supply = <&vcc_sys>;
             regulator-state-mem {
               regulator-off-in-suspend;

_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
https://lists.denx.de/listinfo/u-boot