Drop arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch

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

diff --git a/queue-5.10/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch b/queue-5.10/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 9f1407d..0000000
--- a/queue-5.10/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From aab07b9de8aac8b7b3cb3de6d9e4b61d1e094fb5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:29 +0530
-Subject: arm64: dts: qcom: msm8998: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 5e653a7ff4426242f22dd8bc6af7f29e10ee0d68 ]
-
-QMP PHY used in MSM8998 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: cd3dbe2a4e6c ("arm64: dts: qcom: msm8998: Add UFS nodes")
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-6-58a49d2f4605@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 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index ca8e7848769a6..cccfef52520cd 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1044,12 +1044,12 @@ ufsphy: phy@1da7000 {
-                       #size-cells = <1>;
-                       ranges;
- 
--                      clock-names =
--                              "ref",
--                              "ref_aux";
--                      clocks =
--                              <&gcc GCC_UFS_CLKREF_CLK>,
--                              <&gcc GCC_UFS_PHY_AUX_CLK>;
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK1>,
-+                               <&gcc GCC_UFS_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       reset-names = "ufsphy";
-                       resets = <&ufshc 0>;
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index a0563b4d1a9c87c4f2b7e5858fbac2b8e47415a5..4fe62d8a2c5f25c676dbce26edae218a8b34fe56 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -57,7 +57,6 @@ wifi-iwlwifi-dbg-tlv-ensure-nul-termination.patch
 wifi-iwlwifi-fix-ewrd-table-validity-check.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-fix-ufs-phy-clocks.patch
 printk-add-panic_in_progress-helper.patch
 printk-disable-passing-console-lock-owner-completely.patch
 arm64-dts-mediatek-mt7622-add-missing-device_type-to.patch

diff --git a/queue-5.15/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch b/queue-5.15/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 4fee3a5..0000000
--- a/queue-5.15/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 352596b7c18e9c474339bb79a75e4d8de02482e0 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:29 +0530
-Subject: arm64: dts: qcom: msm8998: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 5e653a7ff4426242f22dd8bc6af7f29e10ee0d68 ]
-
-QMP PHY used in MSM8998 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: cd3dbe2a4e6c ("arm64: dts: qcom: msm8998: Add UFS nodes")
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-6-58a49d2f4605@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 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 3d32bf0986e1e..1815e10c6fda1 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1056,12 +1056,12 @@ ufsphy: phy@1da7000 {
-                       status = "disabled";
-                       ranges;
- 
--                      clock-names =
--                              "ref",
--                              "ref_aux";
--                      clocks =
--                              <&gcc GCC_UFS_CLKREF_CLK>,
--                              <&gcc GCC_UFS_PHY_AUX_CLK>;
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK1>,
-+                               <&gcc GCC_UFS_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       reset-names = "ufsphy";
-                       resets = <&ufshc 0>;
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index f336344c113a4873010045c93e6a70a8cb22ec66..c7cb2b8731eb484bb754103f6c0c1e2476a8c571 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -87,7 +87,6 @@ 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
-arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8150-switch-ufs-qmp-phy-to-new-styl.patch

diff --git a/queue-5.4/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch b/queue-5.4/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index b9b707d..0000000
--- a/queue-5.4/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7478e134dbd5a673861947aad1db0b44a9773ab6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:29 +0530
-Subject: arm64: dts: qcom: msm8998: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 5e653a7ff4426242f22dd8bc6af7f29e10ee0d68 ]
-
-QMP PHY used in MSM8998 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: cd3dbe2a4e6c ("arm64: dts: qcom: msm8998: Add UFS nodes")
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-6-58a49d2f4605@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 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 9cb7163c5714c..697f992aa1c3a 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -967,12 +967,12 @@ ufsphy: phy@1da7000 {
-                       #size-cells = <1>;
-                       ranges;
- 
--                      clock-names =
--                              "ref",
--                              "ref_aux";
--                      clocks =
--                              <&gcc GCC_UFS_CLKREF_CLK>,
--                              <&gcc GCC_UFS_PHY_AUX_CLK>;
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK1>,
-+                               <&gcc GCC_UFS_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       reset-names = "ufsphy";
-                       resets = <&ufshc 0>;
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index cbeca8c3688cdffe76261a37c51f5b663031d77d..7fdbb7a921345abd7605f82c2c7419841ed9e8a6 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -42,7 +42,6 @@ sock_diag-annotate-data-races-around-sock_diag_handl.patch
 af_unix-annotate-data-race-of-gc_in_progress-in-wait.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-fix-ufs-phy-clocks.patch
 arm64-dts-mediatek-mt7622-add-missing-device_type-to.patch
 bpf-add-typecast-to-bpf-helpers-to-help-btf-generati.patch
 bpf-factor-out-bpf_spin_lock-into-helpers.patch

diff --git a/queue-6.1/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch b/queue-6.1/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 075c08a..0000000
--- a/queue-6.1/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 7f332397f1362014e3f65f27a9e8ef7f5215c4e3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:29 +0530
-Subject: arm64: dts: qcom: msm8998: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 5e653a7ff4426242f22dd8bc6af7f29e10ee0d68 ]
-
-QMP PHY used in MSM8998 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: cd3dbe2a4e6c ("arm64: dts: qcom: msm8998: Add UFS nodes")
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-6-58a49d2f4605@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 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 6c3aecea20370..fd81b62c35776 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1021,12 +1021,12 @@ ufsphy: phy@1da7000 {
-                       status = "disabled";
-                       ranges;
- 
--                      clock-names =
--                              "ref",
--                              "ref_aux";
--                      clocks =
--                              <&gcc GCC_UFS_CLKREF_CLK>,
--                              <&gcc GCC_UFS_PHY_AUX_CLK>;
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK1>,
-+                               <&gcc GCC_UFS_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       reset-names = "ufsphy";
-                       resets = <&ufshc 0>;
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index f43c94c3300ef712fa1bde18467eefab508505e4..24ed62e059c324a45f64b0d17b5f9c111c551fca 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -127,7 +127,6 @@ 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
-arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch

diff --git a/queue-6.6/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 1546171..0000000
--- a/queue-6.6/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9bdf41f4da9dc54b2df7d8af4971d4d63ed41404 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:29 +0530
-Subject: arm64: dts: qcom: msm8998: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 5e653a7ff4426242f22dd8bc6af7f29e10ee0d68 ]
-
-QMP PHY used in MSM8998 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: cd3dbe2a4e6c ("arm64: dts: qcom: msm8998: Add UFS nodes")
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-6-58a49d2f4605@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 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index b3bac8a420568..aa96d2219cdf0 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1054,12 +1054,12 @@ ufsphy: phy@1da7000 {
-                       status = "disabled";
-                       ranges;
- 
--                      clock-names =
--                              "ref",
--                              "ref_aux";
--                      clocks =
--                              <&gcc GCC_UFS_CLKREF_CLK>,
--                              <&gcc GCC_UFS_PHY_AUX_CLK>;
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK1>,
-+                               <&gcc GCC_UFS_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       reset-names = "ufsphy";
-                       resets = <&ufshc 0>;
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 5a244432b7e5e0aaaa1b5db6ffcb949218026ee9..36b0daf71b9bf2f5cdd248c1da8dc83c7400df0b 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -187,7 +187,6 @@ 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
-arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch

diff --git a/queue-6.7/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index a705ef8..0000000
--- a/queue-6.7/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a96cce09ab369521f2d71808dc0e404a1f1ece39 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:29 +0530
-Subject: arm64: dts: qcom: msm8998: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 5e653a7ff4426242f22dd8bc6af7f29e10ee0d68 ]
-
-QMP PHY used in MSM8998 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: cd3dbe2a4e6c ("arm64: dts: qcom: msm8998: Add UFS nodes")
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-6-58a49d2f4605@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 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 610ffd0f9e18e..2b22bf795a447 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1051,12 +1051,12 @@ ufsphy: phy@1da7000 {
-                       status = "disabled";
-                       ranges;
- 
--                      clock-names =
--                              "ref",
--                              "ref_aux";
--                      clocks =
--                              <&gcc GCC_UFS_CLKREF_CLK>,
--                              <&gcc GCC_UFS_PHY_AUX_CLK>;
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK1>,
-+                               <&gcc GCC_UFS_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       reset-names = "ufsphy";
-                       resets = <&ufshc 0>;
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 00dca2fc5367168f29f2baad0450a78d21d32067..2e7e5c26f97bedc73672134e5f4835d183af6818 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -212,7 +212,6 @@ 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
-arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch

diff --git a/queue-6.8/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 790d745..0000000
--- a/queue-6.8/arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1ed7d0d9f95e7c0a179492be0aff880e60a36b45 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:29 +0530
-Subject: arm64: dts: qcom: msm8998: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 5e653a7ff4426242f22dd8bc6af7f29e10ee0d68 ]
-
-QMP PHY used in MSM8998 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: cd3dbe2a4e6c ("arm64: dts: qcom: msm8998: Add UFS nodes")
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-6-58a49d2f4605@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 | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8998.dtsi b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-index 317a91d669f82..20200a0d76a6b 100644
---- a/arch/arm64/boot/dts/qcom/msm8998.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8998.dtsi
-@@ -1047,12 +1047,12 @@ ufsphy: phy@1da7000 {
-                       compatible = "qcom,msm8998-qmp-ufs-phy";
-                       reg = <0x01da7000 0x1000>;
- 
--                      clock-names =
--                              "ref",
--                              "ref_aux";
--                      clocks =
--                              <&gcc GCC_UFS_CLKREF_CLK>,
--                              <&gcc GCC_UFS_PHY_AUX_CLK>;
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK1>,
-+                               <&gcc GCC_UFS_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       reset-names = "ufsphy";
-                       resets = <&ufshc 0>;
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index b3c249de2548e03928205772515632ec4067d25d..1030e965016bfacf94b66c85192856bd719779ae 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -154,7 +154,6 @@ 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-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch