From 7b2c9b878f104fc449237bc8a5464629f5a01370 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Wed, 15 Mar 2023 14:01:59 -0400 Subject: [PATCH] Drop arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch Signed-off-by: Sasha Levin --- ...dd-gpu-thermal-zone-cooling-maps-for.patch | 137 ------------------ queue-4.19/series | 1 - ...dd-gpu-thermal-zone-cooling-maps-for.patch | 137 ------------------ queue-5.4/series | 1 - 4 files changed, 276 deletions(-) delete mode 100644 queue-4.19/arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch delete mode 100644 queue-5.4/arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch diff --git a/queue-4.19/arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch b/queue-4.19/arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch deleted file mode 100644 index f0c7db73def..00000000000 --- a/queue-4.19/arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 469b0ec84785f515bd03b948b71cb018796a06e0 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 21 Jan 2020 08:05:10 +0100 -Subject: ARM: dts: exynos: Add GPU thermal zone cooling maps for Odroid - XU3/XU4/HC1 - -From: Marek Szyprowski - -[ Upstream commit 1c651356f482ff08f6acef197a362f2e71d55a98 ] - -Add trip points and cooling maps for GPU thermal zone for Odroid -XU3/XU4/HC1 boards. Trip points are based on the CPU thermal zone for the -those boards. - -Signed-off-by: Marek Szyprowski -Signed-off-by: Krzysztof Kozlowski -Stable-dep-of: 2e3d0e20d845 ("ARM: dts: exynos: correct TMU phandle in Odroid HC1") -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos5422-odroidhc1.dts | 30 ++++++++++ - .../boot/dts/exynos5422-odroidxu3-common.dtsi | 59 +++++++++++++++++++ - 2 files changed, 89 insertions(+) - -diff --git a/arch/arm/boot/dts/exynos5422-odroidhc1.dts b/arch/arm/boot/dts/exynos5422-odroidhc1.dts -index fce5a4579693e..3235d7a27e042 100644 ---- a/arch/arm/boot/dts/exynos5422-odroidhc1.dts -+++ b/arch/arm/boot/dts/exynos5422-odroidhc1.dts -@@ -215,6 +215,36 @@ - }; - }; - }; -+ gpu_thermal: gpu-thermal { -+ thermal-sensors = <&tmu_gpu 0>; -+ trips { -+ gpu_alert0: gpu-alert-0 { -+ temperature = <70000>; -+ hysteresis = <10000>; -+ type = "active"; -+ }; -+ gpu_alert1: gpu-alert-1 { -+ temperature = <85000>; -+ hysteresis = <10000>; -+ type = "active"; -+ }; -+ gpu_crit0: gpu-crit-0 { -+ temperature = <120000>; -+ hysteresis = <0>; -+ type = "critical"; -+ }; -+ }; -+ cooling-maps { -+ map0 { -+ trip = <&gpu_alert0>; -+ cooling-device = <&gpu 0 2>; -+ }; -+ map1 { -+ trip = <&gpu_alert1>; -+ cooling-device = <&gpu 3 6>; -+ }; -+ }; -+ }; - }; - - }; -diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -index 264651141d688..402d69877fd97 100644 ---- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -@@ -359,6 +359,65 @@ - }; - }; - }; -+ gpu_thermal: gpu-thermal { -+ thermal-sensors = <&tmu_gpu 0>; -+ polling-delay-passive = <250>; -+ polling-delay = <0>; -+ trips { -+ gpu_alert0: gpu-alert-0 { -+ temperature = <50000>; -+ hysteresis = <5000>; -+ type = "active"; -+ }; -+ gpu_alert1: gpu-alert-1 { -+ temperature = <60000>; -+ hysteresis = <5000>; -+ type = "active"; -+ }; -+ gpu_alert2: gpu-alert-2 { -+ temperature = <70000>; -+ hysteresis = <5000>; -+ type = "active"; -+ }; -+ gpu_crit0: gpu-crit-0 { -+ temperature = <120000>; -+ hysteresis = <0>; -+ type = "critical"; -+ }; -+ gpu_alert3: gpu-alert-3 { -+ temperature = <70000>; -+ hysteresis = <10000>; -+ type = "passive"; -+ }; -+ gpu_alert4: gpu-alert-4 { -+ temperature = <85000>; -+ hysteresis = <10000>; -+ type = "passive"; -+ }; -+ }; -+ cooling-maps { -+ map0 { -+ trip = <&gpu_alert0>; -+ cooling-device = <&fan0 0 1>; -+ }; -+ map1 { -+ trip = <&gpu_alert1>; -+ cooling-device = <&fan0 1 2>; -+ }; -+ map2 { -+ trip = <&gpu_alert2>; -+ cooling-device = <&fan0 2 3>; -+ }; -+ map3 { -+ trip = <&gpu_alert3>; -+ cooling-device = <&gpu 0 2>; -+ }; -+ map4 { -+ trip = <&gpu_alert4>; -+ cooling-device = <&gpu 3 6>; -+ }; -+ }; -+ }; - }; - }; - --- -2.39.2 - diff --git a/queue-4.19/series b/queue-4.19/series index 917213cdf70..f96cf1e24d0 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -18,7 +18,6 @@ arm-dts-exynos-move-pmu-and-timer-nodes-out-of-soc.patch arm-dts-exynos-correct-tmu-phandle-in-exynos5250.patch kbuild-fix-false-positive-need-builtin-calculation.patch kbuild-generate-modules.order-only-in-directories-vi.patch -arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-hc1.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-xu3-fam.patch scsi-core-remove-the-proc-scsi-proc_name-directory-e.patch diff --git a/queue-5.4/arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch b/queue-5.4/arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch deleted file mode 100644 index 31528a768f8..00000000000 --- a/queue-5.4/arm-dts-exynos-add-gpu-thermal-zone-cooling-maps-for.patch +++ /dev/null @@ -1,137 +0,0 @@ -From ee4b1d5dc30f85c5aad0d30cadc62156bdacfbfb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 21 Jan 2020 08:05:10 +0100 -Subject: ARM: dts: exynos: Add GPU thermal zone cooling maps for Odroid - XU3/XU4/HC1 - -From: Marek Szyprowski - -[ Upstream commit 1c651356f482ff08f6acef197a362f2e71d55a98 ] - -Add trip points and cooling maps for GPU thermal zone for Odroid -XU3/XU4/HC1 boards. Trip points are based on the CPU thermal zone for the -those boards. - -Signed-off-by: Marek Szyprowski -Signed-off-by: Krzysztof Kozlowski -Stable-dep-of: 2e3d0e20d845 ("ARM: dts: exynos: correct TMU phandle in Odroid HC1") -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos5422-odroidhc1.dts | 30 ++++++++++ - .../boot/dts/exynos5422-odroidxu3-common.dtsi | 59 +++++++++++++++++++ - 2 files changed, 89 insertions(+) - -diff --git a/arch/arm/boot/dts/exynos5422-odroidhc1.dts b/arch/arm/boot/dts/exynos5422-odroidhc1.dts -index fce5a4579693e..3235d7a27e042 100644 ---- a/arch/arm/boot/dts/exynos5422-odroidhc1.dts -+++ b/arch/arm/boot/dts/exynos5422-odroidhc1.dts -@@ -215,6 +215,36 @@ - }; - }; - }; -+ gpu_thermal: gpu-thermal { -+ thermal-sensors = <&tmu_gpu 0>; -+ trips { -+ gpu_alert0: gpu-alert-0 { -+ temperature = <70000>; -+ hysteresis = <10000>; -+ type = "active"; -+ }; -+ gpu_alert1: gpu-alert-1 { -+ temperature = <85000>; -+ hysteresis = <10000>; -+ type = "active"; -+ }; -+ gpu_crit0: gpu-crit-0 { -+ temperature = <120000>; -+ hysteresis = <0>; -+ type = "critical"; -+ }; -+ }; -+ cooling-maps { -+ map0 { -+ trip = <&gpu_alert0>; -+ cooling-device = <&gpu 0 2>; -+ }; -+ map1 { -+ trip = <&gpu_alert1>; -+ cooling-device = <&gpu 3 6>; -+ }; -+ }; -+ }; - }; - - }; -diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -index 8388720374932..5cf48af9884c9 100644 ---- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -@@ -357,6 +357,65 @@ - }; - }; - }; -+ gpu_thermal: gpu-thermal { -+ thermal-sensors = <&tmu_gpu 0>; -+ polling-delay-passive = <250>; -+ polling-delay = <0>; -+ trips { -+ gpu_alert0: gpu-alert-0 { -+ temperature = <50000>; -+ hysteresis = <5000>; -+ type = "active"; -+ }; -+ gpu_alert1: gpu-alert-1 { -+ temperature = <60000>; -+ hysteresis = <5000>; -+ type = "active"; -+ }; -+ gpu_alert2: gpu-alert-2 { -+ temperature = <70000>; -+ hysteresis = <5000>; -+ type = "active"; -+ }; -+ gpu_crit0: gpu-crit-0 { -+ temperature = <120000>; -+ hysteresis = <0>; -+ type = "critical"; -+ }; -+ gpu_alert3: gpu-alert-3 { -+ temperature = <70000>; -+ hysteresis = <10000>; -+ type = "passive"; -+ }; -+ gpu_alert4: gpu-alert-4 { -+ temperature = <85000>; -+ hysteresis = <10000>; -+ type = "passive"; -+ }; -+ }; -+ cooling-maps { -+ map0 { -+ trip = <&gpu_alert0>; -+ cooling-device = <&fan0 0 1>; -+ }; -+ map1 { -+ trip = <&gpu_alert1>; -+ cooling-device = <&fan0 1 2>; -+ }; -+ map2 { -+ trip = <&gpu_alert2>; -+ cooling-device = <&fan0 2 3>; -+ }; -+ map3 { -+ trip = <&gpu_alert3>; -+ cooling-device = <&gpu 0 2>; -+ }; -+ map4 { -+ trip = <&gpu_alert4>; -+ cooling-device = <&gpu 3 6>; -+ }; -+ }; -+ }; - }; - }; - --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 79ee215b1ad..9b9c1e3942b 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -24,7 +24,6 @@ irqdomain-fix-domain-registration-race.patch iommu-vt-d-fix-pasid-directory-pointer-coherency.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 arm-dts-exynos-correct-tmu-phandle-in-odroid-hc1.patch arm-dts-exynos-correct-tmu-phandle-in-odroid-xu3-fam.patch smb3-backup-intent-flag-missing-from-some-more-ops.patch -- 2.47.3