diff --git a/patch/kernel/rockchip-rk3588-edge/board-khadas-edge2-mcu.patch b/patch/kernel/rockchip-rk3588-edge/board-khadas-edge2-mcu.patch index a3995e4e3c..64b2cce0b5 100644 --- a/patch/kernel/rockchip-rk3588-edge/board-khadas-edge2-mcu.patch +++ b/patch/kernel/rockchip-rk3588-edge/board-khadas-edge2-mcu.patch @@ -1,11 +1,11 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From 46a9aab7e90e899598f8c0c945f4ff020d9a001c Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Wed, 6 Mar 2024 00:09:25 +0300 -Subject: mfd: khadas-mcu: add Edge2 registers +Subject: [PATCH 1/6] mfd: khadas-mcu: add Edge2 registers --- - drivers/mfd/khadas-mcu.c | 8 +++- - include/linux/mfd/khadas-mcu.h | 24 ++++++++++ + drivers/mfd/khadas-mcu.c | 8 ++++++-- + include/linux/mfd/khadas-mcu.h | 24 ++++++++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/drivers/mfd/khadas-mcu.c b/drivers/mfd/khadas-mcu.c @@ -110,15 +110,16 @@ index a99ba2ed0e4e..63bc9bf76661 100644 /** -- -Armbian +2.44.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From c4e9f9c5fa33dea97005898d4f10ddd51814ae00 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Wed, 6 Mar 2024 00:09:58 +0300 -Subject: mfd: khadas-mcu: drop unused code +Subject: [PATCH 2/6] mfd: khadas-mcu: drop unused code --- - drivers/mfd/khadas-mcu.c | 11 ---------- + drivers/mfd/khadas-mcu.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/mfd/khadas-mcu.c b/drivers/mfd/khadas-mcu.c @@ -151,15 +152,16 @@ index a1a63fb70aac..805fb9eb4a2f 100644 return devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE, khadas_mcu_fan_cells, -- -Armbian +2.44.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From 8bbc226b1d4688b6a0489b1f925aa601e3df960c Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Wed, 6 Mar 2024 00:13:10 +0300 -Subject: thermal: khadas_mcu_fan: add support for Khadas Edge 2 +Subject: [PATCH 3/6] thermal: khadas_mcu_fan: add support for Khadas Edge 2 --- - drivers/thermal/khadas_mcu_fan.c | 77 +++++++++- + drivers/thermal/khadas_mcu_fan.c | 77 ++++++++++++++++++++++++++++++-- 1 file changed, 73 insertions(+), 4 deletions(-) diff --git a/drivers/thermal/khadas_mcu_fan.c b/drivers/thermal/khadas_mcu_fan.c @@ -291,12 +293,13 @@ index d35e5313bea4..e495e562c346 100644 dev->parent->of_node, "khadas-mcu-fan", ctx, &khadas_mcu_fan_cooling_ops); -- -Armbian +2.44.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From b58c8f4916e4c8bdf106cf0b19326b51693173bf Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Wed, 6 Mar 2024 00:14:58 +0300 -Subject: dt-bindings: mfd: khadas-mcu: add cooling-levels property +Subject: [PATCH 4/6] dt-bindings: mfd: khadas-mcu: add cooling-levels property --- Documentation/devicetree/bindings/mfd/khadas,mcu.yaml | 7 ++++++- @@ -328,19 +331,20 @@ index 084960fd5a1f..cf46b690010f 100644 maxItems: 1 -- -Armbian +2.44.0 -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 + +From f9944e2dc8d5ee03a8ac2769d90ee669e09490b3 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Wed, 6 Mar 2024 00:17:58 +0300 -Subject: arm64: dts: rockchip: Add MCU to Khadas Edge 2 +Subject: [PATCH 5/6] arm64: dts: rockchip: Add MCU to Khadas Edge 2 --- arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -index 61a5b98443e9..25b515eb35f4 100644 +index cf29563736ea..a292d1fd7eca 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts @@ -307,6 +307,13 @@ hym8563: rtc@51 { @@ -358,5 +362,86 @@ index 61a5b98443e9..25b515eb35f4 100644 &pinctrl { -- -Armbian +2.44.0 + + +From b48aaebb9b7f6c476671c87465475cdbe7b5833c Mon Sep 17 00:00:00 2001 +From: Muhammed Efe Cetin +Date: Mon, 25 Mar 2024 22:41:26 +0300 +Subject: [PATCH 6/6] arm64: dts: rockchip: Add automatic fan control to Khadas + Edge 2 + +--- + .../dts/rockchip/rk3588s-khadas-edge2.dts | 56 +++++++++++++++++++ + 1 file changed, 56 insertions(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +index a292d1fd7eca..803907ba4037 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +@@ -316,6 +316,62 @@ khadas_mcu: system-controller@18 { + }; + }; + ++&package_thermal { ++ polling-delay = <1000>; ++ ++ trips { ++ package_fan0: package-fan0 { ++ temperature = <45000>; ++ hysteresis = <5000>; ++ type = "active"; ++ }; ++ ++ package_fan1: package-fan1 { ++ temperature = <55000>; ++ hysteresis = <5000>; ++ type = "active"; ++ }; ++ ++ package_fan2: package-fan2 { ++ temperature = <60000>; ++ hysteresis = <5000>; ++ type = "active"; ++ }; ++ ++ package_fan3: package-fan3 { ++ temperature = <70000>; ++ hysteresis = <5000>; ++ type = "active"; ++ }; ++ }; ++ ++ cooling-maps { ++ map0 { ++ trip = <&package_fan0>; ++ cooling-device = <&khadas_mcu 0 1>; ++ contribution = <1024>; ++ }; ++ ++ map1 { ++ trip = <&package_fan1>; ++ cooling-device = <&khadas_mcu 1 2>; ++ contribution = <1024>; ++ }; ++ ++ map2 { ++ trip = <&package_fan2>; ++ cooling-device = <&khadas_mcu 2 3>; ++ contribution = <1024>; ++ }; ++ ++ map3 { ++ trip = <&package_fan3>; ++ cooling-device = <&khadas_mcu 3 THERMAL_NO_LIMIT>; ++ contribution = <1024>; ++ }; ++ }; ++}; ++ + &pinctrl { + vdd_sd { + vdd_sd_en: vdd-sd-en { +-- +2.44.0