From: Sasha Levin Date: Wed, 15 Mar 2023 18:01:53 +0000 (-0400) Subject: Drop arm-dts-exynos-override-thermal-by-label-in-exynos42.patch X-Git-Tag: v4.14.310~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4f293e1ac8fd1c8eee0fa8e6af533bf85905d427;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm-dts-exynos-override-thermal-by-label-in-exynos42.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.19/arm-dts-exynos-override-thermal-by-label-in-exynos42.patch b/queue-4.19/arm-dts-exynos-override-thermal-by-label-in-exynos42.patch deleted file mode 100644 index 440b30ba65d..00000000000 --- a/queue-4.19/arm-dts-exynos-override-thermal-by-label-in-exynos42.patch +++ /dev/null @@ -1,76 +0,0 @@ -From bc0918e731fbc8330d3f0c9546993ac88cbe2049 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 30 Aug 2020 15:51:43 +0200 -Subject: ARM: dts: exynos: Override thermal by label in Exynos4210 - -From: Krzysztof Kozlowski - -[ Upstream commit 1708f56081e239a29ed8646aa7fde6853235d93f ] - -Using full paths to extend or override a device tree node is error prone -since if there was a typo error, a new node will be created instead of -extending the node as it was desired. This will lead to run-time errors -that could be hard to detect. - -A mistyped label on the other hand, will cause a dtc compile error -(during build time). - -Signed-off-by: Krzysztof Kozlowski -Link: https://lore.kernel.org/r/20200830135200.24304-16-krzk@kernel.org -Stable-dep-of: 408ab6786dbf ("ARM: dts: exynos: correct TMU phandle in Exynos4210") -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos4210.dtsi | 36 +++++++++++++++---------------- - 1 file changed, 17 insertions(+), 19 deletions(-) - -diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi -index 0ed9ef75075bc..2ec6c01550564 100644 ---- a/arch/arm/boot/dts/exynos4210.dtsi -+++ b/arch/arm/boot/dts/exynos4210.dtsi -@@ -370,26 +370,24 @@ - }; - }; - }; -+}; - -- thermal-zones { -- cpu_thermal: cpu-thermal { -- polling-delay-passive = <0>; -- polling-delay = <0>; -- thermal-sensors = <&tmu 0>; -- -- trips { -- cpu_alert0: cpu-alert-0 { -- temperature = <85000>; /* millicelsius */ -- }; -- cpu_alert1: cpu-alert-1 { -- temperature = <100000>; /* millicelsius */ -- }; -- cpu_alert2: cpu-alert-2 { -- temperature = <110000>; /* millicelsius */ -- }; -- }; -- }; -- }; -+&cpu_alert0 { -+ temperature = <85000>; /* millicelsius */ -+}; -+ -+&cpu_alert1 { -+ temperature = <100000>; /* millicelsius */ -+}; -+ -+&cpu_alert2 { -+ temperature = <110000>; /* millicelsius */ -+}; -+ -+&cpu_thermal { -+ polling-delay-passive = <0>; -+ polling-delay = <0>; -+ thermal-sensors = <&tmu 0>; - }; - - &gic { --- -2.39.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 4ae6af4de56..917213cdf70 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -12,7 +12,6 @@ udf-remove-pointless-union-in-udf_inode_info.patch udf-preserve-link-count-of-system-files.patch udf-detect-system-inodes-linked-into-directory-hiera.patch arm-dts-exynos-fix-language-typo-and-indentation.patch -arm-dts-exynos-override-thermal-by-label-in-exynos42.patch arm-dts-exynos-correct-tmu-phandle-in-exynos4210.patch arm-dts-exynos-add-all-cpus-in-cooling-maps.patch arm-dts-exynos-move-pmu-and-timer-nodes-out-of-soc.patch diff --git a/queue-5.4/arm-dts-exynos-override-thermal-by-label-in-exynos42.patch b/queue-5.4/arm-dts-exynos-override-thermal-by-label-in-exynos42.patch deleted file mode 100644 index 7cbf62c71ca..00000000000 --- a/queue-5.4/arm-dts-exynos-override-thermal-by-label-in-exynos42.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 4572182b40a2be85d99e32e7a5866202912dfd07 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Sun, 30 Aug 2020 15:51:43 +0200 -Subject: ARM: dts: exynos: Override thermal by label in Exynos4210 - -From: Krzysztof Kozlowski - -[ Upstream commit 1708f56081e239a29ed8646aa7fde6853235d93f ] - -Using full paths to extend or override a device tree node is error prone -since if there was a typo error, a new node will be created instead of -extending the node as it was desired. This will lead to run-time errors -that could be hard to detect. - -A mistyped label on the other hand, will cause a dtc compile error -(during build time). - -Signed-off-by: Krzysztof Kozlowski -Link: https://lore.kernel.org/r/20200830135200.24304-16-krzk@kernel.org -Stable-dep-of: 408ab6786dbf ("ARM: dts: exynos: correct TMU phandle in Exynos4210") -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos4210.dtsi | 36 +++++++++++++++---------------- - 1 file changed, 17 insertions(+), 19 deletions(-) - -diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi -index f220716239dbf..d341dcad8da6d 100644 ---- a/arch/arm/boot/dts/exynos4210.dtsi -+++ b/arch/arm/boot/dts/exynos4210.dtsi -@@ -372,26 +372,24 @@ - }; - }; - }; -+}; - -- thermal-zones { -- cpu_thermal: cpu-thermal { -- polling-delay-passive = <0>; -- polling-delay = <0>; -- thermal-sensors = <&tmu 0>; -- -- trips { -- cpu_alert0: cpu-alert-0 { -- temperature = <85000>; /* millicelsius */ -- }; -- cpu_alert1: cpu-alert-1 { -- temperature = <100000>; /* millicelsius */ -- }; -- cpu_alert2: cpu-alert-2 { -- temperature = <110000>; /* millicelsius */ -- }; -- }; -- }; -- }; -+&cpu_alert0 { -+ temperature = <85000>; /* millicelsius */ -+}; -+ -+&cpu_alert1 { -+ temperature = <100000>; /* millicelsius */ -+}; -+ -+&cpu_alert2 { -+ temperature = <110000>; /* millicelsius */ -+}; -+ -+&cpu_thermal { -+ polling-delay-passive = <0>; -+ polling-delay = <0>; -+ thermal-sensors = <&tmu 0>; - }; - - &gic { --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 0c645f60ec5..79ee215b1ad 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -22,7 +22,6 @@ ipmi-ssif-add-a-timer-between-request-retries.patch irqdomain-change-the-type-of-size-in-__irq_domain_ad.patch irqdomain-fix-domain-registration-race.patch iommu-vt-d-fix-pasid-directory-pointer-coherency.patch -arm-dts-exynos-override-thermal-by-label-in-exynos42.patch arm-dts-exynos-correct-tmu-phandle-in-exynos4210.patch arm-dts-exynos-correct-tmu-phandle-in-exynos5250.patch arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch