Drop arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.15/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch b/queue-5.15/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
deleted file mode 100644 (file)
index 9151fa2..0000000
--- a/queue-5.15/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 3be76fec6d411c9935a5f3c5d24dc46ca44c5733 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Jan 2024 16:04:25 +0200
-Subject: arm64: dts: qcom: msm8998: declare VLS CLAMP register for USB3 PHY
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit fc835b2311d4deb85d776c1d73562338462aa7ac ]
-
-The USB3 PHY on the MSM8998 platform doesn't have built-in
-PCS_MISC_CLAMP_ENABLE register. Instead clamping is handled separately
-via the register in the TCSR space. Declare corresponding register.
-
-Fixes: 026dad8f5873 ("arm64: dts: qcom: msm8998: Add USB-related nodes")
-Cc: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Link: https://lore.kernel.org/r/20240117-usbc-phy-vls-clamp-v2-4-a950c223f10f@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8998.dtsi | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index b3b1258f2d6f8..3d32bf0986e1e 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1081,6 +1081,11 @@ tcsr_mutex_regs: syscon@1f40000 {
-                       reg = <0x01f40000 0x40000>;
-               };
- 
-+              tcsr_regs_2: syscon@1fc0000 {
-+                      compatible = "qcom,msm8998-tcsr", "syscon";
-+                      reg = <0x01fc0000 0x26000>;
-+              };
-+
-               tlmm: pinctrl@3400000 {
-                       compatible = "qcom,msm8998-pinctrl";
-                       reg = <0x03400000 0xc00000>;
-@@ -2010,6 +2015,8 @@ usb3phy: phy@c010000 {
-                       reset-names = "phy",
-                                     "phy_phy";
- 
-+                      qcom,tcsr-reg = <&tcsr_regs_2 0xb244>;
-+
-                       status = "disabled";
-               };
- 
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 2e63211be71a32729b9c72240b09455695e33333..b06772578c1c6127c3863f80ee01f02e309d54d7 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -81,7 +81,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-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
 printk-disable-passing-console-lock-owner-completely.patch
 pwm-sti-implement-.apply-callback.patch

diff --git a/queue-6.1/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch b/queue-6.1/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
deleted file mode 100644 (file)
index 954d375..0000000
--- a/queue-6.1/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 45f9888863197a39194477e0abd0c815dbc6a44a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Jan 2024 16:04:25 +0200
-Subject: arm64: dts: qcom: msm8998: declare VLS CLAMP register for USB3 PHY
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit fc835b2311d4deb85d776c1d73562338462aa7ac ]
-
-The USB3 PHY on the MSM8998 platform doesn't have built-in
-PCS_MISC_CLAMP_ENABLE register. Instead clamping is handled separately
-via the register in the TCSR space. Declare corresponding register.
-
-Fixes: 026dad8f5873 ("arm64: dts: qcom: msm8998: Add USB-related nodes")
-Cc: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Link: https://lore.kernel.org/r/20240117-usbc-phy-vls-clamp-v2-4-a950c223f10f@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8998.dtsi | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 6eef7cbe7d7bf..6c3aecea20370 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1052,6 +1052,11 @@ tcsr_regs_1: syscon@1f60000 {
-                       reg = <0x01f60000 0x20000>;
-               };
- 
-+              tcsr_regs_2: syscon@1fc0000 {
-+                      compatible = "qcom,msm8998-tcsr", "syscon";
-+                      reg = <0x01fc0000 0x26000>;
-+              };
-+
-               tlmm: pinctrl@3400000 {
-                       compatible = "qcom,msm8998-pinctrl";
-                       reg = <0x03400000 0xc00000>;
-@@ -2058,6 +2063,8 @@ usb3phy: phy@c010000 {
-                       reset-names = "phy",
-                                     "phy_phy";
- 
-+                      qcom,tcsr-reg = <&tcsr_regs_2 0xb244>;
-+
-                       status = "disabled";
-               };
- 
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 472c5fe35cc91fc6d77cf80235cc681f9f77ffcd..d11891666fb559d1c088e87b18aff1b25e1a79d4 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -126,7 +126,6 @@ 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
-arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.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-declare-vls-clamp-register-fo.patch b/queue-6.6/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
deleted file mode 100644 (file)
index 712f616..0000000
--- a/queue-6.6/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6816311a44ec748ee0b89ec50548cbc77790be14 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Jan 2024 16:04:25 +0200
-Subject: arm64: dts: qcom: msm8998: declare VLS CLAMP register for USB3 PHY
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit fc835b2311d4deb85d776c1d73562338462aa7ac ]
-
-The USB3 PHY on the MSM8998 platform doesn't have built-in
-PCS_MISC_CLAMP_ENABLE register. Instead clamping is handled separately
-via the register in the TCSR space. Declare corresponding register.
-
-Fixes: 026dad8f5873 ("arm64: dts: qcom: msm8998: Add USB-related nodes")
-Cc: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Link: https://lore.kernel.org/r/20240117-usbc-phy-vls-clamp-v2-4-a950c223f10f@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8998.dtsi | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 85fcbb24b4642..b3bac8a420568 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1085,6 +1085,11 @@ tcsr_regs_1: syscon@1f60000 {
-                       reg = <0x01f60000 0x20000>;
-               };
- 
-+              tcsr_regs_2: syscon@1fc0000 {
-+                      compatible = "qcom,msm8998-tcsr", "syscon";
-+                      reg = <0x01fc0000 0x26000>;
-+              };
-+
-               tlmm: pinctrl@3400000 {
-                       compatible = "qcom,msm8998-pinctrl";
-                       reg = <0x03400000 0xc00000>;
-@@ -2188,6 +2193,8 @@ usb3phy: phy@c010000 {
-                       reset-names = "phy",
-                                     "phy_phy";
- 
-+                      qcom,tcsr-reg = <&tcsr_regs_2 0xb244>;
-+
-                       status = "disabled";
-               };
- 
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index f2b2843d428372c367ccf9ba7ce9b5a77a393538..80396cbedb943c2780a611778223ea741cf189b9 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -184,7 +184,6 @@ 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-msm8998-declare-vls-clamp-register-fo.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-declare-vls-clamp-register-fo.patch b/queue-6.7/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
deleted file mode 100644 (file)
index 6eb5c67..0000000
--- a/queue-6.7/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 38b6db02df6c54de9f5140e4575ddebaeb89e230 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Jan 2024 16:04:25 +0200
-Subject: arm64: dts: qcom: msm8998: declare VLS CLAMP register for USB3 PHY
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit fc835b2311d4deb85d776c1d73562338462aa7ac ]
-
-The USB3 PHY on the MSM8998 platform doesn't have built-in
-PCS_MISC_CLAMP_ENABLE register. Instead clamping is handled separately
-via the register in the TCSR space. Declare corresponding register.
-
-Fixes: 026dad8f5873 ("arm64: dts: qcom: msm8998: Add USB-related nodes")
-Cc: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Link: https://lore.kernel.org/r/20240117-usbc-phy-vls-clamp-v2-4-a950c223f10f@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8998.dtsi | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 7dd0d4ce25ef4..610ffd0f9e18e 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1082,6 +1082,11 @@ tcsr_regs_1: syscon@1f60000 {
-                       reg = <0x01f60000 0x20000>;
-               };
- 
-+              tcsr_regs_2: syscon@1fc0000 {
-+                      compatible = "qcom,msm8998-tcsr", "syscon";
-+                      reg = <0x01fc0000 0x26000>;
-+              };
-+
-               tlmm: pinctrl@3400000 {
-                       compatible = "qcom,msm8998-pinctrl";
-                       reg = <0x03400000 0xc00000>;
-@@ -2185,6 +2190,8 @@ usb3phy: phy@c010000 {
-                       reset-names = "phy",
-                                     "phy_phy";
- 
-+                      qcom,tcsr-reg = <&tcsr_regs_2 0xb244>;
-+
-                       status = "disabled";
-               };
- 
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 827501f12c064c6d57b8f4a90cde880e7a670e6e..6ad7dd17264263ae0d05f3802fca5595b46aefca 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -209,7 +209,6 @@ 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-msm8998-declare-vls-clamp-register-fo.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.8/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch b/queue-6.8/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
deleted file mode 100644 (file)
index 31db293..0000000
--- a/queue-6.8/arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c0abd45869e90dfffcf4c9b1eb6b5f3d1aef5133 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 17 Jan 2024 16:04:25 +0200
-Subject: arm64: dts: qcom: msm8998: declare VLS CLAMP register for USB3 PHY
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit fc835b2311d4deb85d776c1d73562338462aa7ac ]
-
-The USB3 PHY on the MSM8998 platform doesn't have built-in
-PCS_MISC_CLAMP_ENABLE register. Instead clamping is handled separately
-via the register in the TCSR space. Declare corresponding register.
-
-Fixes: 026dad8f5873 ("arm64: dts: qcom: msm8998: Add USB-related nodes")
-Cc: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
-Link: https://lore.kernel.org/r/20240117-usbc-phy-vls-clamp-v2-4-a950c223f10f@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8998.dtsi | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 2793cc22d381a..317a91d669f82 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1072,6 +1072,11 @@ tcsr_regs_1: syscon@1f60000 {
-                       reg = <0x01f60000 0x20000>;
-               };
- 
-+              tcsr_regs_2: syscon@1fc0000 {
-+                      compatible = "qcom,msm8998-tcsr", "syscon";
-+                      reg = <0x01fc0000 0x26000>;
-+              };
-+
-               tlmm: pinctrl@3400000 {
-                       compatible = "qcom,msm8998-pinctrl";
-                       reg = <0x03400000 0xc00000>;
-@@ -2174,6 +2179,8 @@ usb3phy: phy@c010000 {
-                       reset-names = "phy",
-                                     "phy_phy";
- 
-+                      qcom,tcsr-reg = <&tcsr_regs_2 0xb244>;
-+
-                       status = "disabled";
-               };
- 
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 1617cda9e5703105be69ea8875f5ce78e29641f6..4ba0811df19e1b3187c8f3f34f4f2636ebc9e2be 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -151,7 +151,6 @@ arm64-dts-ti-k3-am62p-mcu-wakeup-disable-mcu-and-wak.patch
 arm64-dts-qcom-x1e80100-qcp-fix-supplies-for-ldos-3e.patch
 libbpf-use-opts_set-macro-in-bpf_xdp_query.patch
 wifi-wfx-fix-memory-leak-when-starting-ap.patch
-arm64-dts-qcom-msm8998-declare-vls-clamp-register-fo.patch
 arm64-dts-qcom-qcm2290-declare-vls-clamp-register-fo.patch
 arm64-dts-qcom-sm6115-declare-vls-clamp-register-for.patch
 arm64-dts-qcom-sm8650-fix-ufs-phy-clocks.patch