From: Sasha Levin Date: Mon, 4 Dec 2023 19:51:04 +0000 (-0500) Subject: Drop cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-21745 X-Git-Tag: v4.14.332~23^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0adf4ebc3bfdbeec5a17831821f294f08a6e42e2;p=thirdparty%2Fkernel%2Fstable-queue.git Drop cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-21745 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-21745 b/queue-5.15/cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-21745 deleted file mode 100644 index 92462f8e277..00000000000 --- a/queue-5.15/cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-21745 +++ /dev/null @@ -1,49 +0,0 @@ -From 936763b2345cee656f115db5a86371f8e4d99dd6 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 37d30fa2df5fa..67f98a083d223 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-5.15/series b/queue-5.15/series index 3069de37790..250db8d2482 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -62,7 +62,6 @@ cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch smb3-fix-touch-h-of-symlink.patch-27885 -cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch-21745 iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch-28521 iommu-vt-d-make-context-clearing-consistent-with-con.patch-18873 mmc-core-add-helpers-mmc_regulator_enable-disable_vq.patch