]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.10-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Oct 2023 11:48:58 +0000 (13:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Oct 2023 11:48:58 +0000 (13:48 +0200)
added patches:
revert-clk-imx-pll14xx-dynamically-configure-pll-for-393216000-361267200hz.patch

queue-5.10/revert-clk-imx-pll14xx-dynamically-configure-pll-for-393216000-361267200hz.patch [new file with mode: 0644]
queue-5.10/series

diff --git a/queue-5.10/revert-clk-imx-pll14xx-dynamically-configure-pll-for-393216000-361267200hz.patch b/queue-5.10/revert-clk-imx-pll14xx-dynamically-configure-pll-for-393216000-361267200hz.patch
new file mode 100644 (file)
index 0000000..111fa81
--- /dev/null
@@ -0,0 +1,37 @@
+From 23e1302ec82d40110e3726b1aff1be7ab4ecbbc1 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Sat, 7 Oct 2023 13:42:26 +0200
+Subject: Revert "clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz"
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+This reverts commit 972acd701b1982da9cdbeb892bf17eeef2094508 which is
+commit 72d00e560d10665e6139c9431956a87ded6e9880 upstream.
+
+Marek writes:
+       The commit message states 'Cc: stable@vger.kernel.org # v5.18+'
+       and the commit should only be applied to Linux 5.18.y and newer,
+       on anything older it breaks PLL configuration due to missing
+       prerequisite patches.
+
+Reported-by: Marek Vasut <marex@denx.de>
+Cc: Ahmad Fatoum <a.fatoum@pengutronix.de>
+Cc: Marco Felsch <m.felsch@pengutronix.de>
+Cc: Abel Vesa <abel.vesa@linaro.org>
+Link: https://lore.kernel.org/r/4e5fa5b2-66b8-8f0b-ccb9-c2b774054e4e@denx.de
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/clk/imx/clk-pll14xx.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/clk/imx/clk-pll14xx.c
++++ b/drivers/clk/imx/clk-pll14xx.c
+@@ -60,6 +60,8 @@ static const struct imx_pll14xx_rate_tab
+       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 = {
index 6dd79580cc9956a4c216b04372e250e1dc854bd2..46710488dd4c36aa85e390aaed5a503b5048e6df 100644 (file)
@@ -175,3 +175,4 @@ rbd-decouple-header-read-in-from-updating-rbd_dev-he.patch
 rbd-decouple-parent-info-read-in-from-updating-rbd_d.patch
 rbd-take-header_rwsem-in-rbd_dev_refresh-only-when-u.patch
 block-fix-use-after-free-of-q-q_usage_counter.patch
+revert-clk-imx-pll14xx-dynamically-configure-pll-for-393216000-361267200hz.patch