5.18-stable patches

added patches:
	clk-imx8mp-fix-usb_root_clk-parent.patch

diff --git a/queue-5.18/clk-imx8mp-fix-usb_root_clk-parent.patch b/queue-5.18/clk-imx8mp-fix-usb_root_clk-parent.patch
new file mode 100644 (file)
index 0000000..41c54cf
--- /dev/null
+++ b/queue-5.18/clk-imx8mp-fix-usb_root_clk-parent.patch
@@ -0,0 +1,33 @@
+From cf7f3f4fa9e57b8e9f594823e77e6cbb0ce2b254 Mon Sep 17 00:00:00 2001
+From: Peng Fan <peng.fan@nxp.com>
+Date: Sat, 7 May 2022 20:54:30 +0800
+Subject: clk: imx8mp: fix usb_root_clk parent
+
+From: Peng Fan <peng.fan@nxp.com>
+
+commit cf7f3f4fa9e57b8e9f594823e77e6cbb0ce2b254 upstream.
+
+According to reference mannual CCGR77(usb) sources from hsio_axi, fix
+it.
+
+Fixes: 9c140d9926761 ("clk: imx: Add support for i.MX8MP clock driver")
+Signed-off-by: Peng Fan <peng.fan@nxp.com>
+Reviewed-by: Abel Vesa <abel.vesa@nxp.com>
+Link: https://lore.kernel.org/r/20220507125430.793287-1-peng.fan@oss.nxp.com
+Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/clk/imx/clk-imx8mp.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/clk/imx/clk-imx8mp.c
++++ b/drivers/clk/imx/clk-imx8mp.c
+@@ -659,7 +659,7 @@ static int imx8mp_clocks_probe(struct pl
+       hws[IMX8MP_CLK_UART2_ROOT] = imx_clk_hw_gate4("uart2_root_clk", "uart2", ccm_base + 0x44a0, 0);
+       hws[IMX8MP_CLK_UART3_ROOT] = imx_clk_hw_gate4("uart3_root_clk", "uart3", ccm_base + 0x44b0, 0);
+       hws[IMX8MP_CLK_UART4_ROOT] = imx_clk_hw_gate4("uart4_root_clk", "uart4", ccm_base + 0x44c0, 0);
+-      hws[IMX8MP_CLK_USB_ROOT] = imx_clk_hw_gate4("usb_root_clk", "osc_32k", ccm_base + 0x44d0, 0);
++      hws[IMX8MP_CLK_USB_ROOT] = imx_clk_hw_gate4("usb_root_clk", "hsio_axi", ccm_base + 0x44d0, 0);
+       hws[IMX8MP_CLK_USB_PHY_ROOT] = imx_clk_hw_gate4("usb_phy_root_clk", "usb_phy_ref", ccm_base + 0x44f0, 0);
+       hws[IMX8MP_CLK_USDHC1_ROOT] = imx_clk_hw_gate4("usdhc1_root_clk", "usdhc1", ccm_base + 0x4510, 0);
+       hws[IMX8MP_CLK_USDHC2_ROOT] = imx_clk_hw_gate4("usdhc2_root_clk", "usdhc2", ccm_base + 0x4520, 0);

diff --git a/queue-5.18/series b/queue-5.18/series
index 9def358af22f7716519e7a00b0fed1635f814279..7ca72ea7d237b7c5917b45f8db5403acef7a5c3e 100644 (file)
--- a/queue-5.18/series
+++ b/queue-5.18/series
@@ -138,3 +138,4 @@ powerpc-book3e-get-rid-of-include-generated-compile.h.patch
 dt-bindings-mfd-bd9571mwv-update-rohm-bd9571mwv.yaml-reference.patch
 dt-bindings-interrupt-controller-update-brcm-l2-intc.yaml-reference.patch
 dm-fix-bio_set-allocation.patch
+clk-imx8mp-fix-usb_root_clk-parent.patch