diff --git a/patch/kernel/archive/meson64-6.4/board-odroidn2-add-dumb-gpio-fan.patch b/patch/kernel/archive/meson64-6.4/board-odroidn2-add-dumb-gpio-fan.patch deleted file mode 100644 index 2ced92db0e..0000000000 --- a/patch/kernel/archive/meson64-6.4/board-odroidn2-add-dumb-gpio-fan.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stefan Agner -Date: Mon, 11 Jan 2021 11:38:54 +0100 -Subject: arm64: dts: meson: g12b: add GPIO fan support - -Add simple GPIO fan node to support a fan on GPIO J8. Unfortunately the -pad used to control the fan does not support real PWM, hence the RPM -cannot be modulated. - -Signed-off-by: Stefan Agner -Tested-by: Ricardo Pardini ---- - arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 667d2b774924..e896bac3c5c1 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -47,6 +47,15 @@ fan: gpio-fan { - #cooling-cells = <2>; - }; - -+ /* 5V 80x80x10.8mm cooling fan from Hardkernel shop... */ -+ fan0: gpio-fan { -+ #cooling-cells = <2>; -+ compatible = "gpio-fan"; -+ gpio-fan,speed-map = <0 0 1600 1>; -+ gpios = <&gpio_ao GPIOAO_10 GPIO_ACTIVE_HIGH>; -+ status = "okay"; -+ }; -+ - leds { - compatible = "gpio-leds"; - --- -Armbian - diff --git a/patch/kernel/archive/meson64-6.4/board-odroidn2-add-gpio-fan-as-cooling-device.patch b/patch/kernel/archive/meson64-6.4/board-odroidn2-add-gpio-fan-as-cooling-device.patch deleted file mode 100644 index 6bbddbec72..0000000000 --- a/patch/kernel/archive/meson64-6.4/board-odroidn2-add-gpio-fan-as-cooling-device.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stefan Agner -Date: Mon, 11 Jan 2021 15:53:55 +0100 -Subject: arm64: dts: meson: g12b: odroid-n2: add fan as cooling device - -Add the GPIO fan as a cooling device for the CPU thermal zone. Since we -have only full fan speed available with this, set the tripping point to -30 degrees Celsius. - -Signed-off-by: Stefan Agner ---- - arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 38 ++++++++++ - 1 file changed, 38 insertions(+) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index e896bac3c5c1..2db95373261c 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -+++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -385,6 +385,44 @@ &clkc_audio { - status = "okay"; - }; - -+&cpu_thermal { -+ trips { -+ cpu_warm: cpu_warm { -+ hysteresis = <5000>; -+ temperature = <30000>; -+ type = "active"; -+ }; -+ }; -+ -+ cooling-maps { -+ map0 { -+ cooling-device = -+ <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ trip = <&cpu_warm>; -+ }; -+ map1 { -+ trip = <&cpu_passive>; -+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ map2 { -+ trip = <&cpu_hot>; -+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu102 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu103 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ }; -+}; -+ - &cpu0 { - cpu-supply = <&vddcpu_b>; - operating-points-v2 = <&cpu_opp_table_0>; --- -Armbian -