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.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/arch/arm/dts/rk3399-pinebook-pro.dts b/arch/arm/dts/rk3399-pinebook-pro.dts
index 2b5f001ff4a61f945456e9fdd7bf5c87a0af7ae8..d6b68d77d63a5f2d1ea77e6df8fb9f5f631c4ed8 100644 (file)
--- a/arch/arm/dts/rk3399-pinebook-pro.dts
+++ b/arch/arm/dts/rk3399-pinebook-pro.dts
@@ -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";