From: Sasha Levin Date: Mon, 25 Mar 2024 11:45:13 +0000 (-0400) Subject: Drop arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch X-Git-Tag: v6.8.2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cc99e8c83fa921160ccd3ada943f1cbbb6064cd6;p=thirdparty%2Fkernel%2Fstable-queue.git Drop arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch b/queue-5.15/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch deleted file mode 100644 index c48a998a0dc..00000000000 --- a/queue-5.15/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 8d1c3dbaefa0a2651f8e5b4fc3381a22c3ffb84b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Aug 2023 00:19:46 +0300 -Subject: arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of - bindings - -From: Dmitry Baryshkov - -[ Upstream commit b7efebfeb2e8ad8187cdabba5f0212ba2e6c1069 ] - -Change the USB QMP PHY to use newer style of QMP PHY bindings (single -resource region, no per-PHY subnodes). - -Signed-off-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20230824211952.1397699-11-dmitry.baryshkov@linaro.org -Signed-off-by: Bjorn Andersson -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 | 35 +++++++++++---------------- - 1 file changed, 14 insertions(+), 21 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi -index e1b744d76251d..b3b1258f2d6f8 100644 ---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi -@@ -1982,7 +1982,7 @@ usb3_dwc3: dwc3@a800000 { - interrupts = ; - snps,dis_u2_susphy_quirk; - snps,dis_enblslpm_quirk; -- phys = <&qusb2phy>, <&usb1_ssphy>; -+ phys = <&qusb2phy>, <&usb3phy>; - phy-names = "usb2-phy", "usb3-phy"; - snps,has-lpm-erratum; - snps,hird-threshold = /bits/ 8 <0x10>; -@@ -1991,33 +1991,26 @@ usb3_dwc3: dwc3@a800000 { - - usb3phy: phy@c010000 { - compatible = "qcom,msm8998-qmp-usb3-phy"; -- reg = <0x0c010000 0x18c>; -- status = "disabled"; -- #address-cells = <1>; -- #size-cells = <1>; -- ranges; -+ reg = <0x0c010000 0x1000>; - - clocks = <&gcc GCC_USB3_PHY_AUX_CLK>, -+ <&gcc GCC_USB3_CLKREF_CLK>, - <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, -- <&gcc GCC_USB3_CLKREF_CLK>; -- clock-names = "aux", "cfg_ahb", "ref"; -+ <&gcc GCC_USB3_PHY_PIPE_CLK>; -+ clock-names = "aux", -+ "ref", -+ "cfg_ahb", -+ "pipe"; -+ clock-output-names = "usb3_phy_pipe_clk_src"; -+ #clock-cells = <0>; -+ #phy-cells = <0>; - - resets = <&gcc GCC_USB3_PHY_BCR>, - <&gcc GCC_USB3PHY_PHY_BCR>; -- reset-names = "phy", "common"; -+ reset-names = "phy", -+ "phy_phy"; - -- usb1_ssphy: phy@c010200 { -- reg = <0xc010200 0x128>, -- <0xc010400 0x200>, -- <0xc010c00 0x20c>, -- <0xc010600 0x128>, -- <0xc010800 0x200>; -- #phy-cells = <0>; -- #clock-cells = <0>; -- clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>; -- clock-names = "pipe0"; -- clock-output-names = "usb3_phy_pipe_clk_src"; -- }; -+ status = "disabled"; - }; - - qusb2phy: phy@c012000 { --- -2.43.0 - diff --git a/queue-5.15/series b/queue-5.15/series index b06772578c1..fa92ca0ec3b 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -80,7 +80,6 @@ pwm-atmel-hlcdc-use-consistent-variable-naming.patch 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-msm8998-switch-usb-qmp-phy-to-new-sty.patch printk-add-panic_in_progress-helper.patch printk-disable-passing-console-lock-owner-completely.patch pwm-sti-implement-.apply-callback.patch diff --git a/queue-6.1/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch b/queue-6.1/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch deleted file mode 100644 index 88678a7681c..00000000000 --- a/queue-6.1/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 4c1be7016ee67867542f5dc20b761416b4a49b60 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Aug 2023 00:19:46 +0300 -Subject: arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of - bindings - -From: Dmitry Baryshkov - -[ Upstream commit b7efebfeb2e8ad8187cdabba5f0212ba2e6c1069 ] - -Change the USB QMP PHY to use newer style of QMP PHY bindings (single -resource region, no per-PHY subnodes). - -Signed-off-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20230824211952.1397699-11-dmitry.baryshkov@linaro.org -Signed-off-by: Bjorn Andersson -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 | 35 +++++++++++---------------- - 1 file changed, 14 insertions(+), 21 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi -index 7a41250539ff5..6eef7cbe7d7bf 100644 ---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi -@@ -2030,7 +2030,7 @@ usb3_dwc3: usb@a800000 { - interrupts = ; - snps,dis_u2_susphy_quirk; - snps,dis_enblslpm_quirk; -- phys = <&qusb2phy>, <&usb1_ssphy>; -+ phys = <&qusb2phy>, <&usb3phy>; - phy-names = "usb2-phy", "usb3-phy"; - snps,has-lpm-erratum; - snps,hird-threshold = /bits/ 8 <0x10>; -@@ -2039,33 +2039,26 @@ usb3_dwc3: usb@a800000 { - - usb3phy: phy@c010000 { - compatible = "qcom,msm8998-qmp-usb3-phy"; -- reg = <0x0c010000 0x18c>; -- status = "disabled"; -- #address-cells = <1>; -- #size-cells = <1>; -- ranges; -+ reg = <0x0c010000 0x1000>; - - clocks = <&gcc GCC_USB3_PHY_AUX_CLK>, -+ <&gcc GCC_USB3_CLKREF_CLK>, - <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, -- <&gcc GCC_USB3_CLKREF_CLK>; -- clock-names = "aux", "cfg_ahb", "ref"; -+ <&gcc GCC_USB3_PHY_PIPE_CLK>; -+ clock-names = "aux", -+ "ref", -+ "cfg_ahb", -+ "pipe"; -+ clock-output-names = "usb3_phy_pipe_clk_src"; -+ #clock-cells = <0>; -+ #phy-cells = <0>; - - resets = <&gcc GCC_USB3_PHY_BCR>, - <&gcc GCC_USB3PHY_PHY_BCR>; -- reset-names = "phy", "common"; -+ reset-names = "phy", -+ "phy_phy"; - -- usb1_ssphy: phy@c010200 { -- reg = <0xc010200 0x128>, -- <0xc010400 0x200>, -- <0xc010c00 0x20c>, -- <0xc010600 0x128>, -- <0xc010800 0x200>; -- #phy-cells = <0>; -- #clock-cells = <0>; -- clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>; -- clock-names = "pipe0"; -- clock-output-names = "usb3_phy_pipe_clk_src"; -- }; -+ status = "disabled"; - }; - - qusb2phy: phy@c012000 { --- -2.43.0 - diff --git a/queue-6.1/series b/queue-6.1/series index d11891666fb..066651ae713 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -125,7 +125,6 @@ net-blackhole_dev-fix-build-warning-for-ethh-set-but.patch wifi-ath11k-initialize-rx_mcs_80-and-rx_mcs_160-befo.patch wifi-libertas-fix-some-memleaks-in-lbs_allocate_cmd_.patch wifi-wfx-fix-memory-leak-when-starting-ap.patch -arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch printk-disable-passing-console-lock-owner-completely.patch pwm-sti-fix-capture-for-st-pwm-num-chan-st-capture-n.patch tools-resolve_btfids-refactor-set-sorting-with-types.patch diff --git a/queue-6.6/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch b/queue-6.6/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch deleted file mode 100644 index 81c6d5cc577..00000000000 --- a/queue-6.6/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 9d9533bf6685917a07be13b4203daf919c6be3e6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Aug 2023 00:19:46 +0300 -Subject: arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of - bindings - -From: Dmitry Baryshkov - -[ Upstream commit b7efebfeb2e8ad8187cdabba5f0212ba2e6c1069 ] - -Change the USB QMP PHY to use newer style of QMP PHY bindings (single -resource region, no per-PHY subnodes). - -Signed-off-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20230824211952.1397699-11-dmitry.baryshkov@linaro.org -Signed-off-by: Bjorn Andersson -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 | 35 +++++++++++---------------- - 1 file changed, 14 insertions(+), 21 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi -index f91c58c844afd..85fcbb24b4642 100644 ---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi -@@ -2160,7 +2160,7 @@ usb3_dwc3: usb@a800000 { - interrupts = ; - snps,dis_u2_susphy_quirk; - snps,dis_enblslpm_quirk; -- phys = <&qusb2phy>, <&usb1_ssphy>; -+ phys = <&qusb2phy>, <&usb3phy>; - phy-names = "usb2-phy", "usb3-phy"; - snps,has-lpm-erratum; - snps,hird-threshold = /bits/ 8 <0x10>; -@@ -2169,33 +2169,26 @@ usb3_dwc3: usb@a800000 { - - usb3phy: phy@c010000 { - compatible = "qcom,msm8998-qmp-usb3-phy"; -- reg = <0x0c010000 0x18c>; -- status = "disabled"; -- #address-cells = <1>; -- #size-cells = <1>; -- ranges; -+ reg = <0x0c010000 0x1000>; - - clocks = <&gcc GCC_USB3_PHY_AUX_CLK>, -+ <&gcc GCC_USB3_CLKREF_CLK>, - <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, -- <&gcc GCC_USB3_CLKREF_CLK>; -- clock-names = "aux", "cfg_ahb", "ref"; -+ <&gcc GCC_USB3_PHY_PIPE_CLK>; -+ clock-names = "aux", -+ "ref", -+ "cfg_ahb", -+ "pipe"; -+ clock-output-names = "usb3_phy_pipe_clk_src"; -+ #clock-cells = <0>; -+ #phy-cells = <0>; - - resets = <&gcc GCC_USB3_PHY_BCR>, - <&gcc GCC_USB3PHY_PHY_BCR>; -- reset-names = "phy", "common"; -+ reset-names = "phy", -+ "phy_phy"; - -- usb1_ssphy: phy@c010200 { -- reg = <0xc010200 0x128>, -- <0xc010400 0x200>, -- <0xc010c00 0x20c>, -- <0xc010600 0x128>, -- <0xc010800 0x200>; -- #phy-cells = <0>; -- #clock-cells = <0>; -- clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>; -- clock-names = "pipe0"; -- clock-output-names = "usb3_phy_pipe_clk_src"; -- }; -+ status = "disabled"; - }; - - qusb2phy: phy@c012000 { --- -2.43.0 - diff --git a/queue-6.6/series b/queue-6.6/series index 80396cbedb9..e13ae9d0f20 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -183,7 +183,6 @@ wifi-ath11k-initialize-rx_mcs_80-and-rx_mcs_160-befo.patch wifi-libertas-fix-some-memleaks-in-lbs_allocate_cmd_.patch libbpf-use-opts_set-macro-in-bpf_xdp_query.patch wifi-wfx-fix-memory-leak-when-starting-ap.patch -arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch arm64-dts-qcom-qcm2290-declare-vls-clamp-register-fo.patch arm64-dts-qcom-sm6115-declare-vls-clamp-register-for.patch wifi-ath12k-fix-incorrect-logic-of-calculating-vdev_.patch diff --git a/queue-6.7/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch b/queue-6.7/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch deleted file mode 100644 index b660c52f91d..00000000000 --- a/queue-6.7/arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 9cf7179d579b1eff83d3f3c2ab042fe93a45d023 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 25 Aug 2023 00:19:46 +0300 -Subject: arm64: dts: qcom: msm8998: switch USB QMP PHY to new style of - bindings - -From: Dmitry Baryshkov - -[ Upstream commit b7efebfeb2e8ad8187cdabba5f0212ba2e6c1069 ] - -Change the USB QMP PHY to use newer style of QMP PHY bindings (single -resource region, no per-PHY subnodes). - -Signed-off-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20230824211952.1397699-11-dmitry.baryshkov@linaro.org -Signed-off-by: Bjorn Andersson -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 | 35 +++++++++++---------------- - 1 file changed, 14 insertions(+), 21 deletions(-) - -diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi -index ebc5ba1b369e9..7dd0d4ce25ef4 100644 ---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi -+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi -@@ -2157,7 +2157,7 @@ usb3_dwc3: usb@a800000 { - interrupts = ; - snps,dis_u2_susphy_quirk; - snps,dis_enblslpm_quirk; -- phys = <&qusb2phy>, <&usb1_ssphy>; -+ phys = <&qusb2phy>, <&usb3phy>; - phy-names = "usb2-phy", "usb3-phy"; - snps,has-lpm-erratum; - snps,hird-threshold = /bits/ 8 <0x10>; -@@ -2166,33 +2166,26 @@ usb3_dwc3: usb@a800000 { - - usb3phy: phy@c010000 { - compatible = "qcom,msm8998-qmp-usb3-phy"; -- reg = <0x0c010000 0x18c>; -- status = "disabled"; -- #address-cells = <1>; -- #size-cells = <1>; -- ranges; -+ reg = <0x0c010000 0x1000>; - - clocks = <&gcc GCC_USB3_PHY_AUX_CLK>, -+ <&gcc GCC_USB3_CLKREF_CLK>, - <&gcc GCC_USB_PHY_CFG_AHB2PHY_CLK>, -- <&gcc GCC_USB3_CLKREF_CLK>; -- clock-names = "aux", "cfg_ahb", "ref"; -+ <&gcc GCC_USB3_PHY_PIPE_CLK>; -+ clock-names = "aux", -+ "ref", -+ "cfg_ahb", -+ "pipe"; -+ clock-output-names = "usb3_phy_pipe_clk_src"; -+ #clock-cells = <0>; -+ #phy-cells = <0>; - - resets = <&gcc GCC_USB3_PHY_BCR>, - <&gcc GCC_USB3PHY_PHY_BCR>; -- reset-names = "phy", "common"; -+ reset-names = "phy", -+ "phy_phy"; - -- usb1_ssphy: phy@c010200 { -- reg = <0xc010200 0x128>, -- <0xc010400 0x200>, -- <0xc010c00 0x20c>, -- <0xc010600 0x128>, -- <0xc010800 0x200>; -- #phy-cells = <0>; -- #clock-cells = <0>; -- clocks = <&gcc GCC_USB3_PHY_PIPE_CLK>; -- clock-names = "pipe0"; -- clock-output-names = "usb3_phy_pipe_clk_src"; -- }; -+ status = "disabled"; - }; - - qusb2phy: phy@c012000 { --- -2.43.0 - diff --git a/queue-6.7/series b/queue-6.7/series index 6ad7dd17264..41fc3c36a7e 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -208,7 +208,6 @@ arm64-dts-ti-k3-am69-sk-remove-assigned-clock-parent.patch arm64-dts-ti-k3-am62p-mcu-wakeup-disable-mcu-and-wak.patch libbpf-use-opts_set-macro-in-bpf_xdp_query.patch wifi-wfx-fix-memory-leak-when-starting-ap.patch -arm64-dts-qcom-msm8998-switch-usb-qmp-phy-to-new-sty.patch arm64-dts-qcom-qcm2290-declare-vls-clamp-register-fo.patch arm64-dts-qcom-sm6115-declare-vls-clamp-register-for.patch wifi-ath12k-fix-incorrect-logic-of-calculating-vdev_.patch