diff --git a/buildroot-external/board/hardkernel/patches/linux/0001-Odroid-N2-arm64-dts-fix-audio-name.patch b/buildroot-external/board/hardkernel/patches/linux/0002-Odroid-N2-arm64-dts-fix-audio-name.patch similarity index 100% rename from buildroot-external/board/hardkernel/patches/linux/0001-Odroid-N2-arm64-dts-fix-audio-name.patch rename to buildroot-external/board/hardkernel/patches/linux/0002-Odroid-N2-arm64-dts-fix-audio-name.patch diff --git a/buildroot-external/board/hardkernel/patches/linux/0003-Revert-ODROID-N2-thermal.patch b/buildroot-external/board/hardkernel/patches/linux/0003-Revert-ODROID-N2-thermal.patch new file mode 100644 index 000000000..e4f1e0c60 --- /dev/null +++ b/buildroot-external/board/hardkernel/patches/linux/0003-Revert-ODROID-N2-thermal.patch @@ -0,0 +1,169 @@ +From 85d231e8ec2ecda317fc8baebd12e84a26b42585 Mon Sep 17 00:00:00 2001 +From: Pascal Vizeli +Date: Wed, 27 May 2020 13:23:49 +0000 +Subject: [PATCH 1/1] Revert ODROID-N2 thermal + +Signed-off-by: Pascal Vizeli +--- + .../boot/dts/amlogic/meson-g12-common.dtsi | 57 ------------------- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dts | 48 ---------------- + 2 files changed, 105 deletions(-) + +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +index 03db48434aae..4b2021066c80 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi ++++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +@@ -13,7 +13,6 @@ + #include + #include + #include +-#include + + / { + interrupt-parent = <&gic>; +@@ -129,61 +128,6 @@ + status = "disabled"; + }; + +- thermal-zones { +- cpu_thermal: cpu-thermal { +- polling-delay = <1000>; +- polling-delay-passive = <100>; +- thermal-sensors = <&cpu_temp>; +- +- trips { +- cpu_passive: cpu-passive { +- temperature = <85000>; /* millicelsius */ +- hysteresis = <2000>; /* millicelsius */ +- type = "passive"; +- }; +- +- cpu_hot: cpu-hot { +- temperature = <95000>; /* millicelsius */ +- hysteresis = <2000>; /* millicelsius */ +- type = "hot"; +- }; +- +- cpu_critical: cpu-critical { +- temperature = <110000>; /* millicelsius */ +- hysteresis = <2000>; /* millicelsius */ +- type = "critical"; +- }; +- }; +- }; +- +- ddr_thermal: ddr-thermal { +- polling-delay = <1000>; +- polling-delay-passive = <100>; +- thermal-sensors = <&ddr_temp>; +- +- trips { +- ddr_passive: ddr-passive { +- temperature = <85000>; /* millicelsius */ +- hysteresis = <2000>; /* millicelsius */ +- type = "passive"; +- }; +- +- ddr_critical: ddr-critical { +- temperature = <110000>; /* millicelsius */ +- hysteresis = <2000>; /* millicelsius */ +- type = "critical"; +- }; +- }; +- +- cooling-maps { +- map { +- trip = <&ddr_passive>; +- cooling-device = <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; +- }; +- }; +- }; +- }; +- + ethmac: ethernet@ff3f0000 { + compatible = "amlogic,meson-axg-dwmac", + "snps,dwmac-3.70a", +@@ -2620,7 +2564,6 @@ + assigned-clock-rates = <0>, /* Do Nothing */ + <800000000>, + <0>; /* Do Nothing */ +- #cooling-cells = <2>; + }; + }; + +diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +index 7e0d2ce50066..1cf9af35e435 100644 +--- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts ++++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dts +@@ -340,7 +340,6 @@ + operating-points-v2 = <&cpu_opp_table_0>; + clocks = <&clkc CLKID_CPU_CLK>; + clock-latency = <50000>; +- #cooling-cells = <2>; + }; + + &cpu1 { +@@ -355,7 +354,6 @@ + operating-points-v2 = <&cpub_opp_table_1>; + clocks = <&clkc CLKID_CPUB_CLK>; + clock-latency = <50000>; +- #cooling-cells = <2>; + }; + + &cpu101 { +@@ -379,52 +377,6 @@ + clock-latency = <50000>; + }; + +-&cpu_opp_table_0 { +- opp-1992000000 { +- opp-hz = /bits/ 64 <1992000000>; +- opp-microvolt = <1001000>; +- }; +-}; +- +-&cpub_opp_table_1 { +- opp-1800000000 { +- opp-hz = /bits/ 64 <1800000000>; +- opp-microvolt = <981000>; +- }; +- +- opp-1908000000 { +- opp-hz = /bits/ 64 <1908000000>; +- opp-microvolt = <1022000>; +- }; +- +- opp-2016000000 { +- opp-hz = /bits/ 64 <2016000000>; +- opp-microvolt = <1022000>; +- }; +-}; +- +-&cpu_thermal { +- trips { +- cpu_warm: cpu-warm { +- temperature = <70000>; /* millicelsius */ +- hysteresis = <2000>; /* millicelsius */ +- type = "passive"; +- }; +- }; +- cooling-maps { +- cpufreq_map0 { +- trip = <&cpu_warm>; +- contribution = <1024>; +- cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; +- }; +- cpufreq_map1 { +- trip = <&cpu_warm>; +- contribution = <1024>; +- cooling-device = <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; +- }; +- }; +-}; +- + &ext_mdio { + external_phy: ethernet-phy@0 { + /* Realtek RTL8211F (0x001cc916) */ +-- +2.17.1 +