From: Greg Kroah-Hartman Date: Mon, 20 Jun 2022 12:46:51 +0000 (+0200) Subject: 5.15-stable patches X-Git-Tag: v5.4.200~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b685cecf974775f75c44b00de3088daf6539290a;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: clk-imx8mp-fix-usb_root_clk-parent.patch --- diff --git a/queue-5.15/clk-imx8mp-fix-usb_root_clk-parent.patch b/queue-5.15/clk-imx8mp-fix-usb_root_clk-parent.patch new file mode 100644 index 00000000000..00acd751fd0 --- /dev/null +++ b/queue-5.15/clk-imx8mp-fix-usb_root_clk-parent.patch @@ -0,0 +1,33 @@ +From cf7f3f4fa9e57b8e9f594823e77e6cbb0ce2b254 Mon Sep 17 00:00:00 2001 +From: Peng Fan +Date: Sat, 7 May 2022 20:54:30 +0800 +Subject: clk: imx8mp: fix usb_root_clk parent + +From: Peng Fan + +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 +Reviewed-by: Abel Vesa +Link: https://lore.kernel.org/r/20220507125430.793287-1-peng.fan@oss.nxp.com +Signed-off-by: Abel Vesa +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -675,7 +675,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.15/series b/queue-5.15/series index e5dfdffa6f3..06a0a834bc0 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -103,3 +103,4 @@ kvm-arm64-don-t-read-a-hw-interrupt-pending-state-in-user-context.patch alsa-hda-realtek-fix-right-sounds-and-mute-micmute-leds-for-hp-machine.patch virtio-pci-remove-wrong-address-verification-in-vp_del_vqs.patch powerpc-book3e-get-rid-of-include-generated-compile.h.patch +clk-imx8mp-fix-usb_root_clk-parent.patch