]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop clk-imx patch from 5.4
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Oct 2023 18:04:31 +0000 (20:04 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 Oct 2023 18:04:31 +0000 (20:04 +0200)
queue-5.4/clk-imx-clk-pll14xx-make-two-variables-static.patch [deleted file]
queue-5.4/clk-imx-pll14xx-add-new-frequency-entries-for-pll144.patch [deleted file]
queue-5.4/clk-imx-pll14xx-dynamically-configure-pll-for-393216.patch [deleted file]
queue-5.4/series

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 (file)
index e81d78c..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-From 22a6712e82afda3ca57926c49bddbf00a0514871 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 8 Oct 2019 15:19:08 +0800
-Subject: clk: imx: clk-pll14xx: Make two variables static
-
-From: YueHaibing <yuehaibing@huawei.com>
-
-[ 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 <hulkci@huawei.com>
-Signed-off-by: YueHaibing <yuehaibing@huawei.com>
-Reviewed-by: Anson Huang <Anson.Huang@nxp.com>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-Stable-dep-of: 72d00e560d10 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 (file)
index 8fe67eb..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-From 32c96caaae61ea95b21ddcb5d14a13c8296e5158 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 16 Jan 2020 14:50:49 +0800
-Subject: clk: imx: pll14xx: Add new frequency entries for pll1443x table
-
-From: Anson Huang <Anson.Huang@nxp.com>
-
-[ Upstream commit 57795654fb553a78f07a9f92d87fb2582379cd93 ]
-
-Add new frequency entries to pll1443x table to meet different
-display settings requirement.
-
-Signed-off-by: Anson Huang <Anson.Huang@nxp.com>
-Reviewed-by: Peng Fan <peng.fan@nxp.com>
-Signed-off-by: Shawn Guo <shawnguo@kernel.org>
-Stable-dep-of: 72d00e560d10 ("clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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 (file)
index f0002a3..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-From 9edd1ba5da4ad98d039a988d0251b6a7086bded9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 7 Aug 2023 10:47:44 +0200
-Subject: clk: imx: pll14xx: dynamically configure PLL for
- 393216000/361267200Hz
-
-From: Ahmad Fatoum <a.fatoum@pengutronix.de>
-
-[ 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 <a.fatoum@pengutronix.de>
-Signed-off-by: Marco Felsch <m.felsch@pengutronix.de>
-Link: https://lore.kernel.org/r/20230807084744.1184791-2-m.felsch@pengutronix.de
-Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- 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
-
index 624c62900b7932594b5aecf761c0123fa91cf1f4..2b4382fc967a78b7b253999e5c4faf6ce9415729 100644 (file)
@@ -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