Merge pull request torvalds#199 from Radxa-Alvin/linux-5.10-gen-rkr4.1

Changes for Radxa E61: * Fix HDMI ECE function * Add pwm fan * Add system suspend * Add RS485 * Add CAN Signed-off-by: Stephen Chen <stephen@radxa.com>
RadxaStephen · Sep 1, 2023 · 211237f · 211237f
2 parents fd78925 + 5b48fe8
commit 211237f
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 1 deletion.
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi
@@ -654,6 +654,21 @@
 
 &rockchip_suspend {
 	status = "okay";
+	rockchip,sleep-debug-en = <1>;
+	rockchip,sleep-mode-config = <
+		(0
+		| RKPM_SLP_CENTER_OFF
+		| RKPM_SLP_HW_PLLS_OFF
+		| RKPM_SLP_PMUALIVE_32K
+		| RKPM_SLP_32K_PVTM
+		)
+	>;
+	rockchip,wakeup-config = <
+		(0
+		| RKPM_GPIO_WKUP_EN
+		| RKPM_USB_WKUP_EN
+		)
+	>;
 };
 
 &pinctrl {

diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e61.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e61.dts
@@ -12,6 +12,13 @@
 	model = "Radxa E61";
 	compatible = "radxa,e61", "radxa,cm3i", "rockchip,rk3568";
 
+	fan0: pwm-fan {
+		compatible = "pwm-fan";
+		#cooling-cells = <2>;
+		cooling-levels = <0 64 128 192 255>;
+		pwms = <&pwm8 0 10000 0>;
+	};
+
 	vcc12v_dcin: vcc12v-dcin {
 		compatible = "regulator-fixed";
 		regulator-name = "vcc12v_dcin";
@@ -166,7 +173,7 @@
 
 &hdmi {
 	status = "okay";
-	pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm1_cec>;
+	pinctrl-0 = <&hdmitx_scl &hdmitx_sda &hdmitxm0_cec>;
 };
 
 &hdmi_in_vp0 {
@@ -217,6 +224,28 @@
 	status = "okay";
 };
 
+&soc_thermal {
+	sustainable-power = <5000>; /* milliwatts */
+	cooling-maps {
+		map2 {
+			trip = <&target>;
+			cooling-device =
+				<&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+			contribution = <8192>;
+		};
+		map3 {
+			trip = <&threshold>;
+			cooling-device =
+				<&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
+			contribution = <8192>;
+		};
+	};
+};
+
+&threshold {
+	temperature = <60000>;
+};
+
 &i2c1 {
 	status = "okay";
 	pinctrl-0 = <&i2c1_xfer>;
@@ -231,6 +260,21 @@
 	};
 };
 
+&uart5 {
+	status = "okay";
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart5m1_xfer>;
+};
+
+&can1 {
+	status = "okay";
+	compatible = "rockchip,can-1.0";
+	assigned-clocks = <&cru CLK_CAN1>;
+	assigned-clock-rates = <200000000>;
+	pinctrl-names = "default";
+	pinctrl-0 = <&can1m0_pins>;
+};
+
 &pinctrl {
 	usb {
 		vcc5v0_en: vcc5v0-en {