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

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

diff --git a/queue-6.1/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch b/queue-6.1/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 71d5c80..0000000
--- a/queue-6.1/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6c20efa3e7ee478fe125ad0914ac67d284577690 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:33 +0530
-Subject: arm64: dts: qcom: sm6350: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 68f9fcba3a0c015d649907805534fe66c9c60865 ]
-
-QMP PHY used in SM6350 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: 5a814af5fc22 ("arm64: dts: qcom: sm6350: 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-10-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm6350.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
-index 9da373090593c..3f6817a3ee877 100644
---- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
-@@ -825,10 +825,12 @@ ufs_mem_phy: phy@1d87000 {
-                       #size-cells = <2>;
-                       ranges;
- 
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_MEM_CLKREF_CLK>;
-                       clock-names = "ref",
--                                    "ref_aux";
--                      clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index b29d7d45bd0bfcb177c124e7ad3cbbe0c3a3f652..f11e5d8f7968e0ba00780e76b7cb487a29483a70 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-sm6350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8150-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch

diff --git a/queue-6.6/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 6d932d5..0000000
--- a/queue-6.6/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 13fca3f664392c89294432828fb0e263496d0e68 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:33 +0530
-Subject: arm64: dts: qcom: sm6350: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 68f9fcba3a0c015d649907805534fe66c9c60865 ]
-
-QMP PHY used in SM6350 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: 5a814af5fc22 ("arm64: dts: qcom: sm6350: 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-10-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm6350.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
-index 6464e144c228c..6eb2e4bfff4c6 100644
---- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
-@@ -1192,10 +1192,12 @@ ufs_mem_phy: phy@1d87000 {
-                       #size-cells = <2>;
-                       ranges;
- 
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_MEM_CLKREF_CLK>;
-                       clock-names = "ref",
--                                    "ref_aux";
--                      clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
-+                                    "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 86b911c30aa9e8d9296fa7eff4777ef8e243188e..4916e77e32e52d6c0e04fda11e4356184f1afe68 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-sm6350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8150-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch

diff --git a/queue-6.7/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 4de31a9..0000000
--- a/queue-6.7/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 9e7c8b5309b638f26a0bec52d90d15f81d2b7326 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:33 +0530
-Subject: arm64: dts: qcom: sm6350: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 68f9fcba3a0c015d649907805534fe66c9c60865 ]
-
-QMP PHY used in SM6350 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: 5a814af5fc22 ("arm64: dts: qcom: sm6350: 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-10-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm6350.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
-index 6464e144c228c..6eb2e4bfff4c6 100644
---- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
-@@ -1192,10 +1192,12 @@ ufs_mem_phy: phy@1d87000 {
-                       #size-cells = <2>;
-                       ranges;
- 
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_MEM_CLKREF_CLK>;
-                       clock-names = "ref",
--                                    "ref_aux";
--                      clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
-+                                    "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 431fe8ebe5704d7a618953300705999f7b8eb1d9..c84f5820317ac6ad72ff67bff249720d9919fbc2 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-sm6350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8150-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch

diff --git a/queue-6.8/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 4e70fef..0000000
--- a/queue-6.8/arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 54908b940a4311f6e92adb053334998de5ec691d Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:33 +0530
-Subject: arm64: dts: qcom: sm6350: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 68f9fcba3a0c015d649907805534fe66c9c60865 ]
-
-QMP PHY used in SM6350 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: 5a814af5fc22 ("arm64: dts: qcom: sm6350: 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-10-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm6350.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
-index 43cffe8e1247e..7a2df6bcef7ec 100644
---- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
-@@ -1189,10 +1189,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm6350-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0x1000>;
- 
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_MEM_CLKREF_CLK>;
-                       clock-names = "ref",
--                                    "ref_aux";
--                      clocks = <&gcc GCC_UFS_MEM_CLKREF_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
-+                                    "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 1add708eb32abe8f89b168bd448f6c35429d300f..6e199faccab59ff82ff4882bf9d3ea95b7dddc7b 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-sm6350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8250-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch