From c5da06c2efbc2ab072b1356f07513e1f21df93d1 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Sun, 9 Apr 2023 08:34:15 -0400 Subject: [PATCH] Drop queue-5.15/arm64-dts-imx8mp-correct-usb-clocks.patch --- .../arm64-dts-imx8mp-correct-usb-clocks.patch | 74 ------------------- queue-5.15/series | 1 - 2 files changed, 75 deletions(-) delete mode 100644 queue-5.15/arm64-dts-imx8mp-correct-usb-clocks.patch diff --git a/queue-5.15/arm64-dts-imx8mp-correct-usb-clocks.patch b/queue-5.15/arm64-dts-imx8mp-correct-usb-clocks.patch deleted file mode 100644 index 7a9b1487fbb..00000000000 --- a/queue-5.15/arm64-dts-imx8mp-correct-usb-clocks.patch +++ /dev/null @@ -1,74 +0,0 @@ -From de4dcce44501a59369374ea4bc8a5e3c42b5d7c3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 30 Sep 2022 22:54:23 +0800 -Subject: arm64: dts: imx8mp: correct usb clocks - -From: Li Jun - -[ Upstream commit 8a1ed98fe0f2e7669f0409de0f46f317b275f8be ] - -After commit cf7f3f4fa9e5 ("clk: imx8mp: fix usb_root_clk parent"), -usb_root_clk is no longer for suspend clock so update dts accordingly -to use right bus clock and suspend clock. - -Fixes: fb8587a2c165 ("arm64: dtsi: imx8mp: add usb nodes") -Cc: stable@vger.kernel.org # ed1f4ccfe947: clk: imx: imx8mp: add shared clk gate for usb suspend clk -Cc: stable@vger.kernel.org # v5.19+ -Reviewed-by: Peng Fan -Tested-by: Alexander Stein -Signed-off-by: Li Jun -Signed-off-by: Shawn Guo -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/freescale/imx8mp.dtsi | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi -index ab670b5d641b1..7f338c28a5173 100644 ---- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi -+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi -@@ -890,7 +890,7 @@ - compatible = "fsl,imx8mp-dwc3"; - reg = <0x32f10100 0x8>; - clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, -- <&clk IMX8MP_CLK_USB_ROOT>; -+ <&clk IMX8MP_CLK_USB_SUSP>; - clock-names = "hsio", "suspend"; - interrupts = ; - #address-cells = <1>; -@@ -902,9 +902,9 @@ - usb_dwc3_0: usb@38100000 { - compatible = "snps,dwc3"; - reg = <0x38100000 0x10000>; -- clocks = <&clk IMX8MP_CLK_HSIO_AXI>, -+ clocks = <&clk IMX8MP_CLK_USB_ROOT>, - <&clk IMX8MP_CLK_USB_CORE_REF>, -- <&clk IMX8MP_CLK_USB_ROOT>; -+ <&clk IMX8MP_CLK_USB_SUSP>; - clock-names = "bus_early", "ref", "suspend"; - assigned-clocks = <&clk IMX8MP_CLK_HSIO_AXI>; - assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>; -@@ -931,7 +931,7 @@ - compatible = "fsl,imx8mp-dwc3"; - reg = <0x32f10108 0x8>; - clocks = <&clk IMX8MP_CLK_HSIO_ROOT>, -- <&clk IMX8MP_CLK_USB_ROOT>; -+ <&clk IMX8MP_CLK_USB_SUSP>; - clock-names = "hsio", "suspend"; - interrupts = ; - #address-cells = <1>; -@@ -943,9 +943,9 @@ - usb_dwc3_1: usb@38200000 { - compatible = "snps,dwc3"; - reg = <0x38200000 0x10000>; -- clocks = <&clk IMX8MP_CLK_HSIO_AXI>, -+ clocks = <&clk IMX8MP_CLK_USB_ROOT>, - <&clk IMX8MP_CLK_USB_CORE_REF>, -- <&clk IMX8MP_CLK_USB_ROOT>; -+ <&clk IMX8MP_CLK_USB_SUSP>; - clock-names = "bus_early", "ref", "suspend"; - assigned-clocks = <&clk IMX8MP_CLK_HSIO_AXI>; - assigned-clock-parents = <&clk IMX8MP_SYS_PLL2_500M>; --- -2.39.2 - diff --git a/queue-5.15/series b/queue-5.15/series index 838bd6606e8..82fec47bad5 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -16,7 +16,6 @@ platform-x86-int3472-split-into-2-drivers.patch platform-x86-int3472-discrete-ensure-the-clk-power-e.patch iavf-return-errno-code-instead-of-status-code.patch iavf-iavf_main-actually-log-src-mask-when-talking-ab.patch -arm64-dts-imx8mp-correct-usb-clocks.patch serial-8250_exar-derive-nr_ports-from-pci-id-for-acc.patch serial-exar-add-support-for-sealevel-7xxxc-serial-ca.patch drm-amdgpu-prevent-race-between-late-signaled-fences.patch -- 2.47.2