From 203f9a3399f150f073c6210c0e29d975c4d07993 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 25 Mar 2024 07:14:55 -0400 Subject: [PATCH] Drop arm64-dts-qcom-msm8998-drop-usb-phy-clock-index.patch Signed-off-by: Sasha Levin --- ...com-msm8998-drop-usb-phy-clock-index.patch | 38 ------------------- queue-5.15/series | 1 - 2 files changed, 39 deletions(-) delete mode 100644 queue-5.15/arm64-dts-qcom-msm8998-drop-usb-phy-clock-index.patch diff --git a/queue-5.15/arm64-dts-qcom-msm8998-drop-usb-phy-clock-index.patch b/queue-5.15/arm64-dts-qcom-msm8998-drop-usb-phy-clock-index.patch deleted file mode 100644 index 7cc9a86c1dd..00000000000 --- a/queue-5.15/arm64-dts-qcom-msm8998-drop-usb-phy-clock-index.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a2775efb4ed0dd5a4f1d3525d081bc767b1ba4bb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 5 Jul 2022 13:40:24 +0200 -Subject: arm64: dts: qcom: msm8998: drop USB PHY clock index - -From: Johan Hovold - -[ Upstream commit ed9cbbcb8c6a1925db7995214602c6a8983ff870 ] - -The QMP USB PHY provides a single clock so drop the redundant clock -index. - -Signed-off-by: Johan Hovold -Reviewed-by: Dmitry Baryshkov -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220705114032.22787-7-johan+linaro@kernel.org -Stable-dep-of: fc835b2311d4 ("arm64: dts: qcom: msm8998: declare VLS CLAMP register for USB3 PHY") -Signed-off-by: Sasha Levin ---- - arch/arm64/boot/dts/qcom/msm8998.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi -index 6dbed85fa53e5..e1b744d76251d 100644 ---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi -@@ -2013,7 +2013,7 @@ usb1_ssphy: phy@c010200 { - <0xc010600 0x128>, - <0xc010800 0x200>; - #phy-cells = <0>; -- #clock-cells = <1>; -+ #clock-cells = <0>; - clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>; - clock-names = "pipe0"; - clock-output-names = "usb3_phy_pipe_clk_src"; --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 2e3336197a0..c244ab947bb 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -83,7 +83,6 @@ pwm-atmel-hlcdc-fix-clock-imbalance-related-to-suspe.patch net-blackhole_dev-fix-build-warning-for-ethh-set-but.patch wifi-libertas-fix-some-memleaks-in-lbs_allocate_cmd_.patch arm64-dts-qcom-msm8996-move-clock-cells-to-qmp-phy-c.patch -arm64-dts-qcom-msm8998-drop-usb-phy-clock-index.patch arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch printk-add-panic_in_progress-helper.patch -- 2.47.2