From: Greg Kroah-Hartman Date: Wed, 19 Jul 2023 14:02:16 +0000 (+0200) Subject: drop thermal driver rename patch from 5.15 and 6.1 X-Git-Tag: v6.1.39~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54f39ad2840358b6951f7f0fe8ea20fdaa51cea1;p=thirdparty%2Fkernel%2Fstable-queue.git drop thermal driver rename patch from 5.15 and 6.1 --- diff --git a/queue-5.15/series b/queue-5.15/series index cd625924558..f67d81bf1e5 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -17,7 +17,6 @@ perf-arm-cmn-fix-dtc-reset.patch powercap-rapl-fix-config_iosf_mbi-dependency.patch arm-9303-1-kprobes-avoid-missing-declaration-warning.patch cpufreq-intel_pstate-fix-energy_performance_preferen.patch -thermal-drivers-mediatek-relocate-driver-to-mediatek.patch thermal-drivers-sun8i-fix-some-error-handling-paths-.patch rcutorture-correct-name-of-use_softirq-module-parame.patch rcuscale-always-log-error-message.patch diff --git a/queue-5.15/thermal-drivers-mediatek-relocate-driver-to-mediatek.patch b/queue-5.15/thermal-drivers-mediatek-relocate-driver-to-mediatek.patch deleted file mode 100644 index 4a1f36fe646..00000000000 --- a/queue-5.15/thermal-drivers-mediatek-relocate-driver-to-mediatek.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 8bc1c324d593a8f351ca873d6f4c34c1a8bc7840 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Feb 2023 11:56:23 +0100 -Subject: thermal/drivers/mediatek: Relocate driver to mediatek folder - -From: Balsam CHIHI - -[ Upstream commit fad399ebdd67f602f306b524e6f62c3570943a48 ] - -Add MediaTek proprietary folder to upstream more thermal zone and cooler -drivers, relocate the original thermal controller driver to it, and rename it -as "auxadc_thermal.c" to show its purpose more clearly. - -Signed-off-by: Balsam CHIHI -Reviewed-by: AngeloGioacchino Del Regno -Link: https://lore.kernel.org/r/20230209105628.50294-2-bchihi@baylibre.com -Signed-off-by: Daniel Lezcano -Signed-off-by: Rafael J. Wysocki -Stable-dep-of: 86edac7d3888 ("Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe"") -Signed-off-by: Sasha Levin ---- - drivers/thermal/Kconfig | 14 ++++--------- - drivers/thermal/Makefile | 2 +- - drivers/thermal/mediatek/Kconfig | 21 +++++++++++++++++++ - drivers/thermal/mediatek/Makefile | 1 + - .../auxadc_thermal.c} | 2 +- - 5 files changed, 28 insertions(+), 12 deletions(-) - create mode 100644 drivers/thermal/mediatek/Kconfig - create mode 100644 drivers/thermal/mediatek/Makefile - rename drivers/thermal/{mtk_thermal.c => mediatek/auxadc_thermal.c} (99%) - -diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig -index d7f44deab5b1d..7a4ba50ba97d0 100644 ---- a/drivers/thermal/Kconfig -+++ b/drivers/thermal/Kconfig -@@ -401,16 +401,10 @@ config DA9062_THERMAL - zone. - Compatible with the DA9062 and DA9061 PMICs. - --config MTK_THERMAL -- tristate "Temperature sensor driver for mediatek SoCs" -- depends on ARCH_MEDIATEK || COMPILE_TEST -- depends on HAS_IOMEM -- depends on NVMEM || NVMEM=n -- depends on RESET_CONTROLLER -- default y -- help -- Enable this option if you want to have support for thermal management -- controller present in Mediatek SoCs -+menu "Mediatek thermal drivers" -+depends on ARCH_MEDIATEK || COMPILE_TEST -+source "drivers/thermal/mediatek/Kconfig" -+endmenu - - config AMLOGIC_THERMAL - tristate "Amlogic Thermal Support" -diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile -index 82fc3e616e54b..d02d011b825ac 100644 ---- a/drivers/thermal/Makefile -+++ b/drivers/thermal/Makefile -@@ -54,7 +54,7 @@ obj-y += st/ - obj-$(CONFIG_QCOM_TSENS) += qcom/ - obj-y += tegra/ - obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o --obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o -+obj-y += mediatek/ - obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o - obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o - obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.o -diff --git a/drivers/thermal/mediatek/Kconfig b/drivers/thermal/mediatek/Kconfig -new file mode 100644 -index 0000000000000..7558a847d4e92 ---- /dev/null -+++ b/drivers/thermal/mediatek/Kconfig -@@ -0,0 +1,21 @@ -+config MTK_THERMAL -+ tristate "MediaTek thermal drivers" -+ depends on THERMAL_OF -+ help -+ This is the option for MediaTek thermal software solutions. -+ Please enable corresponding options to get temperature -+ information from thermal sensors or turn on throttle -+ mechaisms for thermal mitigation. -+ -+if MTK_THERMAL -+ -+config MTK_SOC_THERMAL -+ tristate "AUXADC temperature sensor driver for MediaTek SoCs" -+ depends on HAS_IOMEM -+ help -+ Enable this option if you want to get SoC temperature -+ information for MediaTek platforms. -+ This driver configures thermal controllers to collect -+ temperature via AUXADC interface. -+ -+endif -diff --git a/drivers/thermal/mediatek/Makefile b/drivers/thermal/mediatek/Makefile -new file mode 100644 -index 0000000000000..53e86e30b26ff ---- /dev/null -+++ b/drivers/thermal/mediatek/Makefile -@@ -0,0 +1 @@ -+obj-$(CONFIG_MTK_SOC_THERMAL) += auxadc_thermal.o -diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c -similarity index 99% -rename from drivers/thermal/mtk_thermal.c -rename to drivers/thermal/mediatek/auxadc_thermal.c -index ede94eaddddae..60924f8f98e9e 100644 ---- a/drivers/thermal/mtk_thermal.c -+++ b/drivers/thermal/mediatek/auxadc_thermal.c -@@ -23,7 +23,7 @@ - #include - #include - --#include "thermal_hwmon.h" -+#include "../thermal_hwmon.h" - - /* AUXADC Registers */ - #define AUXADC_CON1_SET_V 0x008 --- -2.39.2 - diff --git a/queue-6.1/series b/queue-6.1/series index a78627f45b3..b7b36461b44 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -48,7 +48,6 @@ powercap-rapl-fix-config_iosf_mbi-dependency.patch pm-domains-move-the-verification-of-in-params-from-g.patch arm-9303-1-kprobes-avoid-missing-declaration-warning.patch cpufreq-intel_pstate-fix-energy_performance_preferen.patch -thermal-drivers-mediatek-relocate-driver-to-mediatek.patch thermal-drivers-sun8i-fix-some-error-handling-paths-.patch rcu-make-rcu_cpu_starting-rely-on-interrupts-being-d.patch rcu-tasks-stop-rcu_tasks_invoke_cbs-from-using-never.patch diff --git a/queue-6.1/thermal-drivers-mediatek-relocate-driver-to-mediatek.patch b/queue-6.1/thermal-drivers-mediatek-relocate-driver-to-mediatek.patch deleted file mode 100644 index 1c8c7fe7f15..00000000000 --- a/queue-6.1/thermal-drivers-mediatek-relocate-driver-to-mediatek.patch +++ /dev/null @@ -1,122 +0,0 @@ -From 0c5ad2b0ede5b59edcbbb1114c18d9f5cdda47a4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 9 Feb 2023 11:56:23 +0100 -Subject: thermal/drivers/mediatek: Relocate driver to mediatek folder - -From: Balsam CHIHI - -[ Upstream commit fad399ebdd67f602f306b524e6f62c3570943a48 ] - -Add MediaTek proprietary folder to upstream more thermal zone and cooler -drivers, relocate the original thermal controller driver to it, and rename it -as "auxadc_thermal.c" to show its purpose more clearly. - -Signed-off-by: Balsam CHIHI -Reviewed-by: AngeloGioacchino Del Regno -Link: https://lore.kernel.org/r/20230209105628.50294-2-bchihi@baylibre.com -Signed-off-by: Daniel Lezcano -Signed-off-by: Rafael J. Wysocki -Stable-dep-of: 86edac7d3888 ("Revert "thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe"") -Signed-off-by: Sasha Levin ---- - drivers/thermal/Kconfig | 14 ++++--------- - drivers/thermal/Makefile | 2 +- - drivers/thermal/mediatek/Kconfig | 21 +++++++++++++++++++ - drivers/thermal/mediatek/Makefile | 1 + - .../auxadc_thermal.c} | 2 +- - 5 files changed, 28 insertions(+), 12 deletions(-) - create mode 100644 drivers/thermal/mediatek/Kconfig - create mode 100644 drivers/thermal/mediatek/Makefile - rename drivers/thermal/{mtk_thermal.c => mediatek/auxadc_thermal.c} (99%) - -diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig -index e052dae614ebb..d35f63daca3b7 100644 ---- a/drivers/thermal/Kconfig -+++ b/drivers/thermal/Kconfig -@@ -412,16 +412,10 @@ config DA9062_THERMAL - zone. - Compatible with the DA9062 and DA9061 PMICs. - --config MTK_THERMAL -- tristate "Temperature sensor driver for mediatek SoCs" -- depends on ARCH_MEDIATEK || COMPILE_TEST -- depends on HAS_IOMEM -- depends on NVMEM || NVMEM=n -- depends on RESET_CONTROLLER -- default y -- help -- Enable this option if you want to have support for thermal management -- controller present in Mediatek SoCs -+menu "Mediatek thermal drivers" -+depends on ARCH_MEDIATEK || COMPILE_TEST -+source "drivers/thermal/mediatek/Kconfig" -+endmenu - - config AMLOGIC_THERMAL - tristate "Amlogic Thermal Support" -diff --git a/drivers/thermal/Makefile b/drivers/thermal/Makefile -index 2506c6c8ca83a..766ce38ff4f33 100644 ---- a/drivers/thermal/Makefile -+++ b/drivers/thermal/Makefile -@@ -55,7 +55,7 @@ obj-y += st/ - obj-y += qcom/ - obj-y += tegra/ - obj-$(CONFIG_HISI_THERMAL) += hisi_thermal.o --obj-$(CONFIG_MTK_THERMAL) += mtk_thermal.o -+obj-y += mediatek/ - obj-$(CONFIG_GENERIC_ADC_THERMAL) += thermal-generic-adc.o - obj-$(CONFIG_UNIPHIER_THERMAL) += uniphier_thermal.o - obj-$(CONFIG_AMLOGIC_THERMAL) += amlogic_thermal.o -diff --git a/drivers/thermal/mediatek/Kconfig b/drivers/thermal/mediatek/Kconfig -new file mode 100644 -index 0000000000000..7558a847d4e92 ---- /dev/null -+++ b/drivers/thermal/mediatek/Kconfig -@@ -0,0 +1,21 @@ -+config MTK_THERMAL -+ tristate "MediaTek thermal drivers" -+ depends on THERMAL_OF -+ help -+ This is the option for MediaTek thermal software solutions. -+ Please enable corresponding options to get temperature -+ information from thermal sensors or turn on throttle -+ mechaisms for thermal mitigation. -+ -+if MTK_THERMAL -+ -+config MTK_SOC_THERMAL -+ tristate "AUXADC temperature sensor driver for MediaTek SoCs" -+ depends on HAS_IOMEM -+ help -+ Enable this option if you want to get SoC temperature -+ information for MediaTek platforms. -+ This driver configures thermal controllers to collect -+ temperature via AUXADC interface. -+ -+endif -diff --git a/drivers/thermal/mediatek/Makefile b/drivers/thermal/mediatek/Makefile -new file mode 100644 -index 0000000000000..53e86e30b26ff ---- /dev/null -+++ b/drivers/thermal/mediatek/Makefile -@@ -0,0 +1 @@ -+obj-$(CONFIG_MTK_SOC_THERMAL) += auxadc_thermal.o -diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mediatek/auxadc_thermal.c -similarity index 99% -rename from drivers/thermal/mtk_thermal.c -rename to drivers/thermal/mediatek/auxadc_thermal.c -index 8440692e3890d..b4ef57fa9183e 100644 ---- a/drivers/thermal/mtk_thermal.c -+++ b/drivers/thermal/mediatek/auxadc_thermal.c -@@ -23,7 +23,7 @@ - #include - #include - --#include "thermal_hwmon.h" -+#include "../thermal_hwmon.h" - - /* AUXADC Registers */ - #define AUXADC_CON1_SET_V 0x008 --- -2.39.2 -