From: Greg Kroah-Hartman Date: Thu, 16 Mar 2023 07:35:45 +0000 (+0100) Subject: drop a load of 5.4 arm dts patches as they too did not apply anymore X-Git-Tag: v4.14.310~11 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=92ef0972a0481ae240aedeab2cdeaef045097115;p=thirdparty%2Fkernel%2Fstable-queue.git drop a load of 5.4 arm dts patches as they too did not apply anymore --- diff --git a/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-exynos4210.patch b/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-exynos4210.patch deleted file mode 100644 index 860ebb99044..00000000000 --- a/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-exynos4210.patch +++ /dev/null @@ -1,38 +0,0 @@ -From dda521d9a0e34c1362fc51dca2de53c634d2f9fc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Feb 2023 11:58:37 +0100 -Subject: ARM: dts: exynos: correct TMU phandle in Exynos4210 - -From: Krzysztof Kozlowski - -[ Upstream commit 408ab6786dbf6dd696488054c9559681112ef994 ] - -TMU node uses 0 as thermal-sensor-cells, thus thermal zone referencing -it must not have an argument to phandle. Since thermal-sensors property is -already defined in included exynos4-cpu-thermal.dtsi, drop it from -exynos4210.dtsi to fix the error and remoev redundancy. - -Fixes: 9843a2236003 ("ARM: dts: Provide dt bindings identical for Exynos TMU") -Cc: -Link: https://lore.kernel.org/r/20230209105841.779596-2-krzysztof.kozlowski@linaro.org -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos4210.dtsi | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi -index d341dcad8da6d..505b49118d2cf 100644 ---- a/arch/arm/boot/dts/exynos4210.dtsi -+++ b/arch/arm/boot/dts/exynos4210.dtsi -@@ -389,7 +389,6 @@ - &cpu_thermal { - polling-delay-passive = <0>; - polling-delay = <0>; -- thermal-sensors = <&tmu 0>; - }; - - &gic { --- -2.39.2 - diff --git a/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-exynos5250.patch b/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-exynos5250.patch deleted file mode 100644 index 0ec36522bac..00000000000 --- a/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-exynos5250.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 9cc944cbe9d2b6375898acea3f438298ffd47456 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Feb 2023 11:58:38 +0100 -Subject: ARM: dts: exynos: correct TMU phandle in Exynos5250 - -From: Krzysztof Kozlowski - -[ Upstream commit 33e2c595e2e4016991ead44933a29d1ef93d5f26 ] - -TMU node uses 0 as thermal-sensor-cells, thus thermal zone referencing -it must not have an argument to phandle. - -Cc: -Fixes: 9843a2236003 ("ARM: dts: Provide dt bindings identical for Exynos TMU") -Link: https://lore.kernel.org/r/20230209105841.779596-3-krzysztof.kozlowski@linaro.org -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos5250.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi -index 624fa234e7175..d5eccc86f5f78 100644 ---- a/arch/arm/boot/dts/exynos5250.dtsi -+++ b/arch/arm/boot/dts/exynos5250.dtsi -@@ -1122,7 +1122,7 @@ - &cpu_thermal { - polling-delay-passive = <0>; - polling-delay = <0>; -- thermal-sensors = <&tmu 0>; -+ thermal-sensors = <&tmu>; - - cooling-maps { - map0 { --- -2.39.2 - diff --git a/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-odroid-hc1.patch b/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-odroid-hc1.patch deleted file mode 100644 index 7c102f57688..00000000000 --- a/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-odroid-hc1.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 0e21b33a5076396bbb70c3b0c2965d3c17569400 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Feb 2023 11:58:40 +0100 -Subject: ARM: dts: exynos: correct TMU phandle in Odroid HC1 - -From: Krzysztof Kozlowski - -[ Upstream commit 2e3d0e20d8456f876607a8af61fdb83dfbf98cb6 ] - -TMU node uses 0 as thermal-sensor-cells, thus thermal zone referencing -it must not have an argument to phandle. This was not critical before, -but since rework of thermal Devicetree initialization in the -commit 3fd6d6e2b4e8 ("thermal/of: Rework the thermal device tree -initialization"), this leads to errors registering thermal zones other -than first one: - - thermal_sys: cpu0-thermal: Failed to read thermal-sensors cells: -2 - thermal_sys: Failed to find thermal zone for tmu id=0 - exynos-tmu 10064000.tmu: Failed to register sensor: -2 - exynos-tmu: probe of 10064000.tmu failed with error -2 - -Fixes: 1ac49427b566 ("ARM: dts: exynos: Add support for Hardkernel's Odroid HC1 board") -Cc: -Link: https://lore.kernel.org/r/20230209105841.779596-5-krzysztof.kozlowski@linaro.org -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos5422-odroidhc1.dts | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/boot/dts/exynos5422-odroidhc1.dts b/arch/arm/boot/dts/exynos5422-odroidhc1.dts -index 3235d7a27e042..b423cea4c0e99 100644 ---- a/arch/arm/boot/dts/exynos5422-odroidhc1.dts -+++ b/arch/arm/boot/dts/exynos5422-odroidhc1.dts -@@ -29,7 +29,7 @@ - - thermal-zones { - cpu0_thermal: cpu0-thermal { -- thermal-sensors = <&tmu_cpu0 0>; -+ thermal-sensors = <&tmu_cpu0>; - trips { - cpu0_alert0: cpu-alert-0 { - temperature = <70000>; /* millicelsius */ -@@ -84,7 +84,7 @@ - }; - }; - cpu1_thermal: cpu1-thermal { -- thermal-sensors = <&tmu_cpu1 0>; -+ thermal-sensors = <&tmu_cpu1>; - trips { - cpu1_alert0: cpu-alert-0 { - temperature = <70000>; -@@ -128,7 +128,7 @@ - }; - }; - cpu2_thermal: cpu2-thermal { -- thermal-sensors = <&tmu_cpu2 0>; -+ thermal-sensors = <&tmu_cpu2>; - trips { - cpu2_alert0: cpu-alert-0 { - temperature = <70000>; -@@ -172,7 +172,7 @@ - }; - }; - cpu3_thermal: cpu3-thermal { -- thermal-sensors = <&tmu_cpu3 0>; -+ thermal-sensors = <&tmu_cpu3>; - trips { - cpu3_alert0: cpu-alert-0 { - temperature = <70000>; -@@ -216,7 +216,7 @@ - }; - }; - gpu_thermal: gpu-thermal { -- thermal-sensors = <&tmu_gpu 0>; -+ thermal-sensors = <&tmu_gpu>; - trips { - gpu_alert0: gpu-alert-0 { - temperature = <70000>; --- -2.39.2 - diff --git a/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-odroid-xu3-fam.patch b/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-odroid-xu3-fam.patch deleted file mode 100644 index 59ddd381062..00000000000 --- a/queue-5.4/arm-dts-exynos-correct-tmu-phandle-in-odroid-xu3-fam.patch +++ /dev/null @@ -1,82 +0,0 @@ -From fe2530507d6df156cf4b5ac64c445890ed15d693 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Feb 2023 11:58:41 +0100 -Subject: ARM: dts: exynos: correct TMU phandle in Odroid XU3 family - -From: Krzysztof Kozlowski - -[ Upstream commit a3583e92d188ec6c58c7f603ac5e72dd8a11c21a ] - -TMU node uses 0 as thermal-sensor-cells, thus thermal zone referencing -it must not have an argument to phandle. This was not critical before, -but since rework of thermal Devicetree initialization in the -commit 3fd6d6e2b4e8 ("thermal/of: Rework the thermal device tree -initialization"), this leads to errors registering thermal zones other -than first one: - - thermal_sys: cpu0-thermal: Failed to read thermal-sensors cells: -2 - thermal_sys: Failed to find thermal zone for tmu id=0 - exynos-tmu 10064000.tmu: Failed to register sensor: -2 - exynos-tmu: probe of 10064000.tmu failed with error -2 - -Fixes: f1722d7dd8b8 ("ARM: dts: Define default thermal-zones for exynos5422") -Cc: -Link: https://lore.kernel.org/r/20230209105841.779596-6-krzysztof.kozlowski@linaro.org -Signed-off-by: Krzysztof Kozlowski -Signed-off-by: Sasha Levin ---- - arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -index 5cf48af9884c9..56a0e1eba36fc 100644 ---- a/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -+++ b/arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi -@@ -50,7 +50,7 @@ - - thermal-zones { - cpu0_thermal: cpu0-thermal { -- thermal-sensors = <&tmu_cpu0 0>; -+ thermal-sensors = <&tmu_cpu0>; - polling-delay-passive = <250>; - polling-delay = <0>; - trips { -@@ -139,7 +139,7 @@ - }; - }; - cpu1_thermal: cpu1-thermal { -- thermal-sensors = <&tmu_cpu1 0>; -+ thermal-sensors = <&tmu_cpu1>; - polling-delay-passive = <250>; - polling-delay = <0>; - trips { -@@ -212,7 +212,7 @@ - }; - }; - cpu2_thermal: cpu2-thermal { -- thermal-sensors = <&tmu_cpu2 0>; -+ thermal-sensors = <&tmu_cpu2>; - polling-delay-passive = <250>; - polling-delay = <0>; - trips { -@@ -285,7 +285,7 @@ - }; - }; - cpu3_thermal: cpu3-thermal { -- thermal-sensors = <&tmu_cpu3 0>; -+ thermal-sensors = <&tmu_cpu3>; - polling-delay-passive = <250>; - polling-delay = <0>; - trips { -@@ -358,7 +358,7 @@ - }; - }; - gpu_thermal: gpu-thermal { -- thermal-sensors = <&tmu_gpu 0>; -+ thermal-sensors = <&tmu_gpu>; - polling-delay-passive = <250>; - polling-delay = <0>; - trips { --- -2.39.2 - diff --git a/queue-5.4/series b/queue-5.4/series index 37151a6982d..7a5cac92f8b 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -22,10 +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-correct-tmu-phandle-in-exynos4210.patch -arm-dts-exynos-correct-tmu-phandle-in-exynos5250.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 cifs-fix-uninitialized-memory-read-in-smb3_qfs_tcon.patch scsi-core-remove-the-proc-scsi-proc_name-directory-e.patch