Subtree merge tag 'v6.12-dts' of dts repo [1] into dts/upstream

[u-boot.git] / dts / upstream / src / arm64 / rockchip / rk3399-pinebook-pro.dts

diff --git a/dts/upstream/src/arm64/rockchip/rk3399-pinebook-pro.dts b/dts/upstream/src/arm64/rockchip/rk3399-pinebook-pro.dts
index 054c6a4d1a45f71c7951752cbe8e86bd4e24d6ab..a5a7e374bc59478e70115af8604776376f9fb0a3 100644 (file)
--- a/dts/upstream/src/arm64/rockchip/rk3399-pinebook-pro.dts
+++ b/dts/upstream/src/arm64/rockchip/rk3399-pinebook-pro.dts
@@ -12,7 +12,6 @@
 #include <dt-bindings/usb/pd.h>
 #include <dt-bindings/leds/common.h>
 #include "rk3399.dtsi"
-#include "rk3399-opp.dtsi"
 
 / {
        model = "Pine64 Pinebook Pro";
@@ -32,12 +31,12 @@
        backlight: edp-backlight {
                compatible = "pwm-backlight";
                power-supply = <&vcc_12v>;
-               pwms = <&pwm0 0 740740 0>;
+               pwms = <&pwm0 0 125000 0>;
        };
 
        bat: battery {
                compatible = "simple-battery";
-               charge-full-design-microamp-hours = <9800000>;
+               charge-full-design-microamp-hours = <10000000>;
                voltage-max-design-microvolt = <4350000>;
                voltage-min-design-microvolt = <3000000>;
        };
@@ -779,7 +778,6 @@
 };
 
 &pcie0 {
-       bus-scan-delay-ms = <1000>;
        ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
        num-lanes = <4>;
        pinctrl-names = "default";