Skip to contentSkip to conversation

rockchip: pinebook-pro: sync PBP dtb to 5.18

PATCH In review Peter Robinson 2 participants 2 messages Jun 12, 2022 – Jun 29, 2022 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rockchip: pinebook-pro: sync PBP dtb to 5.18

Sync the pinebook pro to upstream 5.18, in particular this brings brings in a fix so the DP is disabled so Linux will actually boot.

---
 arch/arm/dts/rk3399-pinebook-pro.dts | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
arch/arm/dts/rk3399-pinebook-pro.dts +3 -8
index 2b5f001ff4a..d6b68d77d63 100644
@@ -17,6 +17,7 @@
 / {
 	model = "Pine64 Pinebook Pro";
 	compatible = "pine64,pinebook-pro", "rockchip,rk3399";
+	chassis-type = "laptop";
 
 	aliases {
 		mmc0 = &sdio0;
@@ -242,12 +243,12 @@
 	vdd_log: vdd-log {
 		compatible = "pwm-regulator";
 		pwms = <&pwm2 0 25000 1>;
+		pwm-supply = <&vcc_sysin>;
 		regulator-name = "vdd_log";
 		regulator-always-on;
 		regulator-boot-on;
 		regulator-min-microvolt = <800000>;
 		regulator-max-microvolt = <1400000>;
-		vin-supply = <&vcc_sysin>;
 
 		regulator-state-mem {
 			regulator-on-in-suspend;
@@ -385,10 +386,6 @@
 	};
 };
 
-&cdn_dp {
-	status = "okay";
-};
-
 &cpu_b0 {
 	cpu-supply = <&vdd_cpu_b>;
 };
@@ -475,8 +472,6 @@
 		vcc10-supply = <&vcc_sysin>;
 		vcc11-supply = <&vcc_sysin>;
 		vcc12-supply = <&vcc3v3_sys>;
-		vcc13-supply = <&vcc_sysin>;
-		vcc14-supply = <&vcc_sysin>;
 
 		regulators {
 			/* rk3399 center logic supply */
@@ -711,7 +706,7 @@
 
 		connector {
 			compatible = "usb-c-connector";
-			data-role = "host";
+			data-role = "dual";
 			label = "USB-C";
 			op-sink-microwatt = <1000000>;
 			power-role = "dual";
Signature · 1 line
2.36.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Peter Robinson

Sync the pinebook pro to upstream 5.18, in particular this brings brings in a fix so the DP is disabled so Linux will actually boot.

Thanks,

- Kever

Quoted 59 lines
---
  arch/arm/dts/rk3399-pinebook-pro.dts | 11 +++--------
  1 file changed, 3 insertions(+), 8 deletions(-)
arch/arm/dts/rk3399-pinebook-pro.dts +3 -8
index 2b5f001ff4a..d6b68d77d63 100644
@@ -17,6 +17,7 @@
  / {
  	model = "Pine64 Pinebook Pro";
  	compatible = "pine64,pinebook-pro", "rockchip,rk3399";
+	chassis-type = "laptop";
 
  	aliases {
  		mmc0 = &sdio0;
@@ -242,12 +243,12 @@
  	vdd_log: vdd-log {
  		compatible = "pwm-regulator";
  		pwms = <&pwm2 0 25000 1>;
+		pwm-supply = <&vcc_sysin>;
  		regulator-name = "vdd_log";
  		regulator-always-on;
  		regulator-boot-on;
  		regulator-min-microvolt = <800000>;
  		regulator-max-microvolt = <1400000>;
-		vin-supply = <&vcc_sysin>;
 
  		regulator-state-mem {
  			regulator-on-in-suspend;
@@ -385,10 +386,6 @@
  	};
  };
 
-&cdn_dp {
-	status = "okay";
-};
-
  &cpu_b0 {
  	cpu-supply = <&vdd_cpu_b>;
  };
@@ -475,8 +472,6 @@
  		vcc10-supply = <&vcc_sysin>;
  		vcc11-supply = <&vcc_sysin>;
  		vcc12-supply = <&vcc3v3_sys>;
-		vcc13-supply = <&vcc_sysin>;
-		vcc14-supply = <&vcc_sysin>;
 
  		regulators {
  			/* rk3399 center logic supply */
@@ -711,7 +706,7 @@
 
  		connector {
  			compatible = "usb-c-connector";
-			data-role = "host";
+			data-role = "dual";
  			label = "USB-C";
  			op-sink-microwatt = <1000000>;
  			power-role = "dual";