Drop arm-dts-exynos-override-thermal-by-label-in-exynos52.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-4.19/arm-dts-exynos-override-thermal-by-label-in-exynos52.patch b/queue-4.19/arm-dts-exynos-override-thermal-by-label-in-exynos52.patch
deleted file mode 100644 (file)
index da2dcc9..0000000
--- a/queue-4.19/arm-dts-exynos-override-thermal-by-label-in-exynos52.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From 896485715713d64b1a805dd59cd3342a30a93bc4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 1 Sep 2020 09:54:11 +0200
-Subject: ARM: dts: exynos: Override thermal by label in Exynos5250
-
-From: Krzysztof Kozlowski <krzk@kernel.org>
-
-[ Upstream commit 7e86ef5cc89609cbad8b9dd2f476789c638dbb92 ]
-
-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 <krzk@kernel.org>
-Link: https://lore.kernel.org/r/20200901075417.22481-8-krzk@kernel.org
-Stable-dep-of: 33e2c595e2e4 ("ARM: dts: exynos: correct TMU phandle in Exynos5250")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/exynos5250.dtsi | 38 +++++++++++++++----------------
- 1 file changed, 18 insertions(+), 20 deletions(-)
-
-diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
-index 59e5f0016b862..1883b8c2cd7b9 100644
---- a/arch/arm/boot/dts/exynos5250.dtsi
-+++ b/arch/arm/boot/dts/exynos5250.dtsi
-@@ -1043,26 +1043,6 @@
-               };
-       };
- 
--      thermal-zones {
--              cpu_thermal: cpu-thermal {
--                      polling-delay-passive = <0>;
--                      polling-delay = <0>;
--                      thermal-sensors = <&tmu 0>;
--
--                      cooling-maps {
--                              map0 {
--                                   /* Corresponds to 800MHz at freq_table */
--                                   cooling-device = <&cpu0 9 9>, <&cpu1 9 9>;
--                              };
--                              map1 {
--                                   /* Corresponds to 200MHz at freq_table */
--                                   cooling-device = <&cpu0 15 15>,
--                                                    <&cpu1 15 15>;
--                             };
--                     };
--              };
--      };
--
-       timer {
-               compatible = "arm,armv7-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-@@ -1078,6 +1058,24 @@
-       };
- };
- 
-+&cpu_thermal {
-+      polling-delay-passive = <0>;
-+      polling-delay = <0>;
-+      thermal-sensors = <&tmu 0>;
-+
-+      cooling-maps {
-+              map0 {
-+                      /* Corresponds to 800MHz at freq_table */
-+                      cooling-device = <&cpu0 9 9>, <&cpu1 9 9>;
-+              };
-+              map1 {
-+                      /* Corresponds to 200MHz at freq_table */
-+                      cooling-device = <&cpu0 15 15>,
-+                                       <&cpu1 15 15>;
-+              };
-+      };
-+};
-+
- &dp {
-       power-domains = <&pd_disp1>;
-       clocks = <&clock CLK_DP>;
--- 
-2.39.2
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 30b42cfac2e940eaf3319124e1fec0402df08fae..4ae6af4de56910b130660f3e9721c7c478d18b21 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -16,7 +16,6 @@ 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
-arm-dts-exynos-override-thermal-by-label-in-exynos52.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

diff --git a/queue-5.4/arm-dts-exynos-override-thermal-by-label-in-exynos52.patch b/queue-5.4/arm-dts-exynos-override-thermal-by-label-in-exynos52.patch
deleted file mode 100644 (file)
index 54b940e..0000000
--- a/queue-5.4/arm-dts-exynos-override-thermal-by-label-in-exynos52.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From f5f62ff385b0977362ad4ef89affd9a38ed0a7f7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 1 Sep 2020 09:54:11 +0200
-Subject: ARM: dts: exynos: Override thermal by label in Exynos5250
-
-From: Krzysztof Kozlowski <krzk@kernel.org>
-
-[ Upstream commit 7e86ef5cc89609cbad8b9dd2f476789c638dbb92 ]
-
-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 <krzk@kernel.org>
-Link: https://lore.kernel.org/r/20200901075417.22481-8-krzk@kernel.org
-Stable-dep-of: 33e2c595e2e4 ("ARM: dts: exynos: correct TMU phandle in Exynos5250")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm/boot/dts/exynos5250.dtsi | 38 +++++++++++++++----------------
- 1 file changed, 18 insertions(+), 20 deletions(-)
-
-diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
-index fc966c10cf498..624fa234e7175 100644
---- a/arch/arm/boot/dts/exynos5250.dtsi
-+++ b/arch/arm/boot/dts/exynos5250.dtsi
-@@ -1104,26 +1104,6 @@
-               };
-       };
- 
--      thermal-zones {
--              cpu_thermal: cpu-thermal {
--                      polling-delay-passive = <0>;
--                      polling-delay = <0>;
--                      thermal-sensors = <&tmu 0>;
--
--                      cooling-maps {
--                              map0 {
--                                   /* Corresponds to 800MHz at freq_table */
--                                   cooling-device = <&cpu0 9 9>, <&cpu1 9 9>;
--                              };
--                              map1 {
--                                   /* Corresponds to 200MHz at freq_table */
--                                   cooling-device = <&cpu0 15 15>,
--                                                    <&cpu1 15 15>;
--                             };
--                     };
--              };
--      };
--
-       timer {
-               compatible = "arm,armv7-timer";
-               interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
-@@ -1139,6 +1119,24 @@
-       };
- };
- 
-+&cpu_thermal {
-+      polling-delay-passive = <0>;
-+      polling-delay = <0>;
-+      thermal-sensors = <&tmu 0>;
-+
-+      cooling-maps {
-+              map0 {
-+                      /* Corresponds to 800MHz at freq_table */
-+                      cooling-device = <&cpu0 9 9>, <&cpu1 9 9>;
-+              };
-+              map1 {
-+                      /* Corresponds to 200MHz at freq_table */
-+                      cooling-device = <&cpu0 15 15>,
-+                                       <&cpu1 15 15>;
-+              };
-+      };
-+};
-+
- &dp {
-       power-domains = <&pd_disp1>;
-       clocks = <&clock CLK_DP>;
--- 
-2.39.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 3f9f7b3c55d165bd90bfab08b5342e49d27b9639..0c645f60ec538a74834c2fa7e8811fff183fc84e 100644 (file)
--- 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-override-thermal-by-label-in-exynos42.patch
 arm-dts-exynos-correct-tmu-phandle-in-exynos4210.patch
-arm-dts-exynos-override-thermal-by-label-in-exynos52.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