To modify the PWM-fan temperature control policy of fine3399 to adjus…

…t the fan speed to a lower level (armbian#6843) * To modify the PWM-fan temperature control policy of fine3399 to adjust the fan speed to a lower level * Integrating support for xiaobaonas boards into the rockchip64-6.9 kernel
ColorfulRhino · Jul 9, 2024 · 41aa99e · 41aa99e
1 parent 7a054c6
commit 41aa99e
Show file tree

Hide file tree

Showing 4 changed files with 1,835 additions and 32 deletions.
diff --git a/patch/kernel/archive/rockchip64-6.6/add-board-fine3399-dts.patch b/patch/kernel/archive/rockchip64-6.6/add-board-fine3399-dts.patch
@@ -2,7 +2,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts b/arch/arm64/boot/
 new file mode 100644
 --- /dev/null
 +++ b/arch/arm64/boot/dts/rockchip/rk3399-fine3399.dts
-@@ -0,0 +1,797 @@
+@@ -0,0 +1,871 @@
 +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
 +
 +/dts-v1/;
@@ -134,7 +134,7 @@ new file mode 100644
 +
 +	fan0: pwm-fan {
 +		compatible = "pwm-fan";
-+		cooling-levels = <0 150 200 255>;
++		cooling-levels = <0 30 60 90 120 160>;
 +		#cooling-cells = <2>;
 +		fan-supply = <&vcc_sys>;
 +		pwms = <&pwm1 0 40000 0>;
@@ -162,6 +162,14 @@ new file mode 100644
 +		};
 +	};
 +
++	backlight: backlight {
++		compatible = "pwm-backlight";
++		brightness-levels = <0 4 8 16 32 64 128 255>;
++		default-brightness-level = <5>;
++		pwms = <&pwm0 0 1000000 0>;
++		status = "okay";
++	};
++
 +};
 +
 +&cpu_l0 {
@@ -195,18 +203,28 @@ new file mode 100644
 +
 +&cpu_thermal {
 +	trips {
++		cpu_warm: cpu_warm {
++			temperature = <50000>;
++			hysteresis = <2000>;
++			type = "active";
++		};
++
 +		cpu_hot: cpu_hot {
-+			hysteresis = <10000>;
-+			temperature = <55000>;
++			temperature = <65000>;
++			hysteresis = <2000>;
 +			type = "active";
 +		};
 +	};
 +
 +	cooling-maps {
 +		map2 {
-+			cooling-device =
-+				<&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++			trip = <&cpu_warm>;
++			cooling-device = <&fan0 THERMAL_NO_LIMIT 1>;
++		};
++
++		map3 {
 +			trip = <&cpu_hot>;
++			cooling-device = <&fan0 4 THERMAL_NO_LIMIT>;
 +		};
 +	};
 +};
@@ -231,6 +249,39 @@ new file mode 100644
 +	status = "okay";
 +};
 +
++&gpu {
++	mali-supply = <&vdd_gpu>;
++	status = "okay";
++};
++
++&gpu_thermal {
++	trips {
++		gpu_warm: gpu_warm {
++			temperature = <50000>;
++			hysteresis = <2000>;
++			type = "active";
++		};
++
++		gpu_hot: gpu_hot {
++			temperature = <65000>;
++			hysteresis = <2000>;
++			type = "active";
++		};
++	};
++
++	cooling-maps {
++		map1 {
++			trip = <&gpu_warm>;
++			cooling-device = <&fan0 THERMAL_NO_LIMIT 1>;
++		};
++
++		map2 {
++			trip = <&gpu_hot>;
++			cooling-device = <&fan0 4 THERMAL_NO_LIMIT>;
++		};
++	};
++};
++
 +&hdmi {
 +	ddc-i2c-bus = <&i2c3>;
 +	pinctrl-names = "default";
@@ -541,6 +592,22 @@ new file mode 100644
 +		};
 +	};
 +
++	spi2 {
++		spi2_cs0: spi2-cs0 {
++			rockchip,pins =
++				<2 RK_PB4 2 &pcfg_pull_up>;
++		};
++	};
++
++	display_pin:display-pin {
++		DC_pin: dc-pin {
++			rockchip,pins = <1 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++		reset_pin: reset-pin {
++			rockchip,pins = <1 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
++		};
++	};
++
 +	bt {
 +		bt_enable_h: bt-enable-h {
 +			rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
@@ -581,12 +648,12 @@ new file mode 100644
 +		};
 +	};
 +};
-+/*
++
 +// TFT
 +&pwm0 {
 +	status = "okay";
 +};
-+*/
++
 +// FAN
 +&pwm1 {
 +	status = "okay";
@@ -663,25 +730,32 @@ new file mode 100644
 +	};
 +};
 +*/
-+/*
++
 +&spi2 {
 +	status = "okay";
 +	pinctrl-names = "default";
 +	pinctrl-0 = <&spi2_clk &spi2_tx &spi2_cs0>;
 +
-+	panel@0 {
-+		compatible = "sitronix,st7789v";
++	st7735r@0 {
++		status = "okay";
++		compatible = "sitronix,st7735r";
 +		reg = <0>;
-+		// backlight = <&pwm0>;
++		rgb;
++		rotate = <270>;
++		width = <80>;
++		height = <160>;
++		fps = <30>;
++		buswidth = <8>;
++		backlight = <&backlight>;
 +		dc-gpios = <&gpio4 RK_PD5 GPIO_ACTIVE_HIGH>;
 +		reset-gpios = <&gpio4 RK_PD1 GPIO_ACTIVE_LOW>;
 +		led-gpios = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;  
-+		spi-max-frequency = <15000000>;
-+		spi-cs-high;
-+		status = "okay";
++		spi-max-frequency = <32000000>;
++		spi-cpol;
++		spi-cpha;
 +	};
 +};
-+*/
++
 +&tcphy0 {
 +	status = "okay";
 +};