rockchip: improve support for fine3399

This commit is contained in:
sfwtw 2025-03-03 16:10:01 +08:00
parent 543621f9d6
commit ec108ac504
3 changed files with 39 additions and 18 deletions

View File

@ -17,7 +17,7 @@
+}; +};
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/rk3399-fine-3399.dts +++ b/arch/arm/dts/rk3399-fine-3399.dts
@@ -0,0 +1,789 @@ @@ -0,0 +1,799 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+ +
+/dts-v1/; +/dts-v1/;
@ -120,7 +120,7 @@
+ vin-supply = <&vcc_sys>; + vin-supply = <&vcc_sys>;
+ }; + };
+ +
+ leds: gpio-leds { + gpio-leds {
+ compatible = "gpio-leds"; + compatible = "gpio-leds";
+ pinctrl-names = "default"; + pinctrl-names = "default";
+ pinctrl-0 = <&user_led2>; + pinctrl-0 = <&user_led2>;
@ -149,7 +149,7 @@
+ +
+ fan0: pwm-fan { + fan0: pwm-fan {
+ compatible = "pwm-fan"; + compatible = "pwm-fan";
+ cooling-levels = <0 25 50 75 100 150>; + cooling-levels = <0 30 60 90 120 160>;
+ #cooling-cells = <2>; + #cooling-cells = <2>;
+ fan-supply = <&vcc_sys>; + fan-supply = <&vcc_sys>;
+ pwms = <&pwm1 0 40000 0>; + pwms = <&pwm1 0 40000 0>;
@ -215,18 +215,28 @@
+ +
+&cpu_thermal { +&cpu_thermal {
+ trips { + trips {
+ cpu_warm: cpu_warm {
+ temperature = <50000>;
+ hysteresis = <2000>;
+ type = "active";
+ };
+
+ cpu_hot: cpu_hot { + cpu_hot: cpu_hot {
+ hysteresis = <10000>; + temperature = <65000>;
+ temperature = <55000>; + hysteresis = <2000>;
+ type = "active"; + type = "active";
+ }; + };
+ }; + };
+ +
+ cooling-maps { + cooling-maps {
+ map2 { + map2 {
+ cooling-device = + trip = <&cpu_warm>;
+ <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; + cooling-device = <&fan0 THERMAL_NO_LIMIT 1>;
+ };
+
+ map3 {
+ trip = <&cpu_hot>; + trip = <&cpu_hot>;
+ cooling-device = <&fan0 4 THERMAL_NO_LIMIT>;
+ }; + };
+ }; + };
+}; +};
@ -675,7 +685,7 @@
+ status = "okay"; + status = "okay";
+ +
+ panel@0 { + panel@0 {
+ compatible = "sitronix,st7735s", "sitronix,st7735r", "sitronix,st7789v", "jianda,jd-t18003-t01"; + compatible = "jianda,jd-t18003-t01";
+ reg = <0>; + reg = <0>;
+ rgb; + rgb;
+ width = <80>; + width = <80>;

View File

@ -9,7 +9,7 @@
/ { / {
model = "RUMU3F Fine3399"; model = "RUMU3F Fine3399";
compatible = "rumu3f,fine-3399","rockchip,rk3399"; compatible = "rumu3f,fine-3399", "rockchip,rk3399";
aliases { aliases {
ethernet0 = &gmac; ethernet0 = &gmac;
@ -100,7 +100,7 @@
vin-supply = <&vcc_sys>; vin-supply = <&vcc_sys>;
}; };
leds: gpio-leds { gpio-leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&user_led2>; pinctrl-0 = <&user_led2>;
@ -127,9 +127,9 @@
}; };
}; };
fan0: pwm-fan { fan: pwm-fan {
compatible = "pwm-fan"; compatible = "pwm-fan";
cooling-levels = <0 25 50 75 100 150>; cooling-levels = <0 30 60 90 120 160>;
#cooling-cells = <2>; #cooling-cells = <2>;
fan-supply = <&vcc_sys>; fan-supply = <&vcc_sys>;
pwms = <&pwm1 0 40000 0>; pwms = <&pwm1 0 40000 0>;
@ -195,18 +195,28 @@
&cpu_thermal { &cpu_thermal {
trips { trips {
cpu_warm: cpu_warm {
temperature = <50000>;
hysteresis = <2000>;
type = "active";
};
cpu_hot: cpu_hot { cpu_hot: cpu_hot {
hysteresis = <10000>; temperature = <65000>;
temperature = <55000>; hysteresis = <2000>;
type = "active"; type = "active";
}; };
}; };
cooling-maps { cooling-maps {
map2 { map2 {
cooling-device = trip = <&cpu_warm>;
<&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; cooling-device = <&fan THERMAL_NO_LIMIT 1>;
};
map3 {
trip = <&cpu_hot>; trip = <&cpu_hot>;
cooling-device = <&fan 4 THERMAL_NO_LIMIT>;
}; };
}; };
}; };
@ -656,7 +666,7 @@
status = "okay"; status = "okay";
panel@0 { panel@0 {
compatible = "sitronix,st7735s", "sitronix,st7735r", "sitronix,st7789v", "jianda,jd-t18003-t01"; compatible = "jianda,jd-t18003-t01";
reg = <0>; reg = <0>;
rgb; rgb;
width = <80>; width = <80>;

View File

@ -458,7 +458,8 @@ define Device/rumu3f_fine-3399
SOC := rk3399 SOC := rk3399
UBOOT_DEVICE_NAME := fine3399-rk3399 UBOOT_DEVICE_NAME := fine3399-rk3399
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
DEVICE_PACKAGES := kmod-gpio-button-hotplug kmod-r8168 DEVICE_PACKAGES := brcmfmac-firmware-43430b0-sdio brcmfmac-nvram-43430b0-sdio \
kmod-brcmfmac kmod-gpio-button-hotplug kmod-usb-net-rtl8152 wpad
endef endef
TARGET_DEVICES += rumu3f_fine-3399 TARGET_DEVICES += rumu3f_fine-3399