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

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

diff --git a/queue-6.6/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 3131105..0000000
--- a/queue-6.6/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 1a3f14fc9c4b73aa45013f48e09682c02ff631b7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:38 +0530
-Subject: arm64: dts: qcom: sm8350: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 8edbdefee1c9eb24690d5794556af08f00ecc576 ]
-
-QMP PHY used in SM8350 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPMh
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-While at it, let's move 'clocks' property before 'clock-names' to match
-the style used commonly.
-
-Fixes: 59c7cf814783 ("arm64: dts: qcom: sm8350: 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-15-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8350.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-index 6e0318a0c4ea4..e7fc49c6d0490 100644
---- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-@@ -1724,10 +1724,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8350-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0x1000>;
- 
--                      clock-names = "ref",
--                                    "ref_aux";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_1_CLKREF_EN>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 216344dc6c90dd7e2ef9851b70fb595410bf0d92..0fc8a0ef5a0db0afb5a6e068b2fa12c085e13a1b 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -188,7 +188,6 @@ 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-sm8350-switch-ufs-qmp-phy-to-new-styl.patch
-arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch
 wifi-ath12k-fix-incorrect-logic-of-calculating-vdev_.patch
 printk-disable-passing-console-lock-owner-completely.patch

diff --git a/queue-6.7/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index f58644e..0000000
--- a/queue-6.7/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e772a8fd2ceb78401760fc154997ca7ee1afafbc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:38 +0530
-Subject: arm64: dts: qcom: sm8350: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 8edbdefee1c9eb24690d5794556af08f00ecc576 ]
-
-QMP PHY used in SM8350 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPMh
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-While at it, let's move 'clocks' property before 'clock-names' to match
-the style used commonly.
-
-Fixes: 59c7cf814783 ("arm64: dts: qcom: sm8350: 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-15-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8350.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-index 19172ed7ec2be..4ad4cefa0b75f 100644
---- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-@@ -1725,10 +1725,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8350-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0x1000>;
- 
--                      clock-names = "ref",
--                                    "ref_aux";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_1_CLKREF_EN>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index d17b1da89b8501e227f47253414fc47f347386d2..de7000bdb98edfc2dcca9fceafaf74974de29a50 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -213,7 +213,6 @@ 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-sm8350-switch-ufs-qmp-phy-to-new-styl.patch
-arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch
 wifi-ath12k-fix-incorrect-logic-of-calculating-vdev_.patch
 printk-nbcon-relocate-32bit-seq-macros.patch

diff --git a/queue-6.8/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index bc4c2f0..0000000
--- a/queue-6.8/arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 5e53494e4e751873918d75dfa190fb348fee0d3d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:38 +0530
-Subject: arm64: dts: qcom: sm8350: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 8edbdefee1c9eb24690d5794556af08f00ecc576 ]
-
-QMP PHY used in SM8350 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPMh
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-While at it, let's move 'clocks' property before 'clock-names' to match
-the style used commonly.
-
-Fixes: 59c7cf814783 ("arm64: dts: qcom: sm8350: 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-15-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8350.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-index e78c83a897c28..ab233d6843931 100644
---- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
-@@ -1726,10 +1726,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8350-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0x1000>;
- 
--                      clock-names = "ref",
--                                    "ref_aux";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_1_CLKREF_EN>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 9441f7791b0cd56677deb5d5e3cab76f4a9492b6..1e055a43005c81974d94d65e33afc713c6c1923b 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-sm8350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8650-fix-ufs-phy-clocks.patch
 wifi-ath12k-fix-incorrect-logic-of-calculating-vdev_.patch