From: Greg Kroah-Hartman Date: Mon, 9 Oct 2023 18:04:31 +0000 (+0200) Subject: drop clk-imx patch from 5.4 X-Git-Tag: v4.14.327~19 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80b52e141a10376ad8fbc37df9e16bdd1b1f7d3a;p=thirdparty%2Fkernel%2Fstable-queue.git drop clk-imx patch from 5.4 --- diff --git a/queue-5.4/clk-imx-clk-pll14xx-make-two-variables-static.patch b/queue-5.4/clk-imx-clk-pll14xx-make-two-variables-static.patch deleted file mode 100644 index e81d78c512e..00000000000 --- a/queue-5.4/clk-imx-clk-pll14xx-make-two-variables-static.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 22a6712e82afda3ca57926c49bddbf00a0514871 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 8 Oct 2019 15:19:08 +0800 -Subject: clk: imx: clk-pll14xx: Make two variables static - -From: YueHaibing - -[ Upstream commit 8f2d3c1759d19232edf1e9ef43d40a44e31493d6 ] - -Fix sparse warnings: - -drivers/clk/imx/clk-pll14xx.c:44:37: - warning: symbol 'imx_pll1416x_tbl' was not declared. Should it be static? -drivers/clk/imx/clk-pll14xx.c:57:37: - warning: symbol 'imx_pll1443x_tbl' was not declared. Should it be static? - -Reported-by: Hulk Robot -Signed-off-by: YueHaibing -Reviewed-by: Anson Huang -Signed-off-by: Shawn Guo -Stable-dep-of: 72d00e560d10 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz") -Signed-off-by: Sasha Levin ---- - drivers/clk/imx/clk-pll14xx.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c -index c43e9653b4156..129a28c3366eb 100644 ---- a/drivers/clk/imx/clk-pll14xx.c -+++ b/drivers/clk/imx/clk-pll14xx.c -@@ -41,7 +41,7 @@ struct clk_pll14xx { - - #define to_clk_pll14xx(_hw) container_of(_hw, struct clk_pll14xx, hw) - --const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { -+static const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { - PLL_1416X_RATE(1800000000U, 225, 3, 0), - PLL_1416X_RATE(1600000000U, 200, 3, 0), - PLL_1416X_RATE(1200000000U, 300, 3, 1), -@@ -52,7 +52,7 @@ const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { - PLL_1416X_RATE(600000000U, 300, 3, 2), - }; - --const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { -+static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { - PLL_1443X_RATE(650000000U, 325, 3, 2, 0), - PLL_1443X_RATE(594000000U, 198, 2, 2, 0), - PLL_1443X_RATE(393216000U, 262, 2, 3, 9437), --- -2.40.1 - diff --git a/queue-5.4/clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch b/queue-5.4/clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch deleted file mode 100644 index 8fe67ebc34c..00000000000 --- a/queue-5.4/clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 32c96caaae61ea95b21ddcb5d14a13c8296e5158 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 16 Jan 2020 14:50:49 +0800 -Subject: clk: imx: pll14xx: Add new frequency entries for pll1443x table - -From: Anson Huang - -[ Upstream commit 57795654fb553a78f07a9f92d87fb2582379cd93 ] - -Add new frequency entries to pll1443x table to meet different -display settings requirement. - -Signed-off-by: Anson Huang -Reviewed-by: Peng Fan -Signed-off-by: Shawn Guo -Stable-dep-of: 72d00e560d10 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz") -Signed-off-by: Sasha Levin ---- - drivers/clk/imx/clk-pll14xx.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c -index 129a28c3366eb..e7bf6babc28b4 100644 ---- a/drivers/clk/imx/clk-pll14xx.c -+++ b/drivers/clk/imx/clk-pll14xx.c -@@ -53,8 +53,10 @@ static const struct imx_pll14xx_rate_table imx_pll1416x_tbl[] = { - }; - - static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { -+ PLL_1443X_RATE(1039500000U, 173, 2, 1, 16384), - PLL_1443X_RATE(650000000U, 325, 3, 2, 0), - PLL_1443X_RATE(594000000U, 198, 2, 2, 0), -+ PLL_1443X_RATE(519750000U, 173, 2, 2, 16384), - PLL_1443X_RATE(393216000U, 262, 2, 3, 9437), - PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), - }; --- -2.40.1 - diff --git a/queue-5.4/clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch b/queue-5.4/clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch deleted file mode 100644 index f0002a35118..00000000000 --- a/queue-5.4/clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 9edd1ba5da4ad98d039a988d0251b6a7086bded9 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 7 Aug 2023 10:47:44 +0200 -Subject: clk: imx: pll14xx: dynamically configure PLL for - 393216000/361267200Hz - -From: Ahmad Fatoum - -[ Upstream commit 72d00e560d10665e6139c9431956a87ded6e9880 ] - -Since commit b09c68dc57c9 ("clk: imx: pll14xx: Support dynamic rates"), -the driver has the ability to dynamically compute PLL parameters to -approximate the requested rates. This is not always used, because the -logic is as follows: - - - Check if the target rate is hardcoded in the frequency table - - Check if varying only kdiv is possible, so switch over is glitch free - - Compute rate dynamically by iterating over pdiv range - -If we skip the frequency table for the 1443x PLL, we find that the -computed values differ to the hardcoded ones. This can be valid if the -hardcoded values guarantee for example an earlier lock-in or if the -divisors are chosen, so that other important rates are more likely to -be reached glitch-free. - -For rates (393216000 and 361267200, this doesn't seem to be the case: -They are only approximated by existing parameters (393215995 and -361267196 Hz, respectively) and they aren't reachable glitch-free from -other hardcoded frequencies. Dropping them from the table allows us -to lock-in to these frequencies exactly. - -This is immediately noticeable because they are the assigned-clock-rates -for IMX8MN_AUDIO_PLL1 and IMX8MN_AUDIO_PLL2, respectively and a look -into clk_summary so far showed that they were a few Hz short of the target: - -imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary -audio_pll2_out 0 0 0 361267196 0 0 50000 N -audio_pll1_out 1 1 0 393215995 0 0 50000 Y - -and afterwards: - -imx8mn-board:~# grep audio_pll[12]_out /sys/kernel/debug/clk/clk_summary -audio_pll2_out 0 0 0 361267200 0 0 50000 N -audio_pll1_out 1 1 0 393216000 0 0 50000 Y - -This change is equivalent to adding following hardcoded values: - - /* rate mdiv pdiv sdiv kdiv */ - PLL_1443X_RATE(393216000, 655, 5, 3, 23593), - PLL_1443X_RATE(361267200, 497, 33, 0, -16882), - -Fixes: 053a4ffe2988 ("clk: imx: imx8mm: fix audio pll setting") -Cc: stable@vger.kernel.org # v5.18+ -Signed-off-by: Ahmad Fatoum -Signed-off-by: Marco Felsch -Link: https://lore.kernel.org/r/20230807084744.1184791-2-m.felsch@pengutronix.de -Signed-off-by: Abel Vesa -Signed-off-by: Sasha Levin ---- - drivers/clk/imx/clk-pll14xx.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c -index e7bf6babc28b4..0dbe8c05af478 100644 ---- a/drivers/clk/imx/clk-pll14xx.c -+++ b/drivers/clk/imx/clk-pll14xx.c -@@ -57,8 +57,6 @@ static const struct imx_pll14xx_rate_table imx_pll1443x_tbl[] = { - PLL_1443X_RATE(650000000U, 325, 3, 2, 0), - PLL_1443X_RATE(594000000U, 198, 2, 2, 0), - PLL_1443X_RATE(519750000U, 173, 2, 2, 16384), -- PLL_1443X_RATE(393216000U, 262, 2, 3, 9437), -- PLL_1443X_RATE(361267200U, 361, 3, 3, 17511), - }; - - struct imx_pll14xx_clk imx_1443x_pll = { --- -2.40.1 - diff --git a/queue-5.4/series b/queue-5.4/series index 624c62900b7..2b4382fc967 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -33,9 +33,6 @@ i2c-mux-demux-pinctrl-check-the-return-value-of-devm.patch input-i8042-add-quirk-for-tuxedo-gemini-17-gen1-clev.patch scsi-qla2xxx-fix-update_fcport-for-current_topology.patch scsi-qla2xxx-fix-deletion-race-condition.patch -clk-imx-clk-pll14xx-make-two-variables-static.patch -clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch -clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch drm-amd-display-reinstate-lfc-optimization.patch drm-amd-display-fix-lfc-multiplier-changing-erratica.patch drm-amd-display-prevent-potential-division-by-zero-e.patch