From: Sasha Levin Date: Mon, 4 Dec 2023 19:50:19 +0000 (-0500) Subject: Drop cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-9104 X-Git-Tag: v4.14.332~23^2~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f98252cb701e8644611214ae6b9b46134b330770;p=thirdparty%2Fkernel%2Fstable-queue.git Drop cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-9104 Signed-off-by: Sasha Levin --- diff --git a/queue-6.1/cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-9104 b/queue-6.1/cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-9104 deleted file mode 100644 index 1efe609d60f..00000000000 --- a/queue-6.1/cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-9104 +++ /dev/null @@ -1,49 +0,0 @@ -From 1a18355fedff8e2975a28471a199f453456c36b5 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 22 Nov 2023 14:41:13 +0100 -Subject: cpufreq: imx6q: Don't disable 792 Mhz OPP unnecessarily - -From: Christoph Niedermaier - -[ Upstream commit 2e4e0984c7d696cc74cf2fd7e7f62997f0e9ebe6 ] - -For a 900MHz i.MX6ULL CPU the 792MHz OPP is disabled. There is no -convincing reason to disable this OPP. If a CPU can run at 900MHz, -it should also be able to cope with 792MHz. Looking at the voltage -level of 792MHz in [1] (page 24, table 10. "Operating Ranges") the -current defined OPP is above the minimum. So the voltage level -shouldn't be a problem. However in [2] (page 24, table 10. -"Operating Ranges"), it is not mentioned that 792MHz OPP isn't -allowed. Change it to only disable 792MHz OPP for i.MX6ULL types -below 792 MHz. - -[1] https://www.nxp.com/docs/en/data-sheet/IMX6ULLIEC.pdf -[2] https://www.nxp.com/docs/en/data-sheet/IMX6ULLCEC.pdf - -Fixes: 0aa9abd4c212 ("cpufreq: imx6q: check speed grades for i.MX6ULL") -Signed-off-by: Christoph Niedermaier -Reviewed-by: Marek Vasut -Reviewed-by: Fabio Estevam -[ Viresh: Edited subject ] -Signed-off-by: Viresh Kumar -Signed-off-by: Sasha Levin ---- - drivers/cpufreq/imx6q-cpufreq.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/cpufreq/imx6q-cpufreq.c b/drivers/cpufreq/imx6q-cpufreq.c -index ae834fb9bfbd5..925fc17eaacb2 100644 ---- a/drivers/cpufreq/imx6q-cpufreq.c -+++ b/drivers/cpufreq/imx6q-cpufreq.c -@@ -327,7 +327,7 @@ static int imx6ul_opp_check_speed_grading(struct device *dev) - imx6x_disable_freq_in_opp(dev, 696000000); - - if (of_machine_is_compatible("fsl,imx6ull")) { -- if (val != OCOTP_CFG3_6ULL_SPEED_792MHZ) -+ if (val < OCOTP_CFG3_6ULL_SPEED_792MHZ) - imx6x_disable_freq_in_opp(dev, 792000000); - - if (val != OCOTP_CFG3_6ULL_SPEED_900MHZ) --- -2.42.0 - diff --git a/queue-6.1/series b/queue-6.1/series index 472c715c8e2..3e99f95bbe7 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -92,7 +92,6 @@ iommu-vt-d-add-device_block_translation-helper.patch iommu-vt-d-disable-pci-ats-in-legacy-passthrough-mod.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch drm-amd-pm-fix-a-memleak-in-aldebaran_tables_init.patch -cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-9104 iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch-10784 iommu-vt-d-allocate-pasid-table-in-device-probe-path.patch-8635 iommu-vt-d-add-device_block_translation-helper.patch-1231