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

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

diff --git a/queue-6.6/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 521feee..0000000
--- a/queue-6.6/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From d4545ecab2075a980797c181279ea196e4bc60e7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:31 +0530
-Subject: arm64: dts: qcom: sm6115: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit a820a285ef1b7c7fd94055bbb114c0413c04b96b ]
-
-QMP PHY used in SM6115 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: 97e563bf5ba1 ("arm64: dts: qcom: sm6115: Add basic soc dtsi")
-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-8-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm6115.dtsi | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
-index 87cbc4e8b1ed5..442c821fc18d9 100644
---- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
-@@ -1040,8 +1040,12 @@ ufs_mem_phy: phy@4807000 {
-                       #size-cells = <2>;
-                       ranges;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      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 a0a40a7ee2a981d73294042854fd31dd72d80dc3..11ffcab94255addc6b21a8f1eedbfa9ef917220f 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-sm6115-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8150-switch-ufs-qmp-phy-to-new-styl.patch

diff --git a/queue-6.7/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index fbf77ef..0000000
--- a/queue-6.7/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 56accb7a1df77daabd2beeac8ede4469d30d784b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:31 +0530
-Subject: arm64: dts: qcom: sm6115: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit a820a285ef1b7c7fd94055bbb114c0413c04b96b ]
-
-QMP PHY used in SM6115 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: 97e563bf5ba1 ("arm64: dts: qcom: sm6115: Add basic soc dtsi")
-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-8-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm6115.dtsi | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
-index 87cbc4e8b1ed5..442c821fc18d9 100644
---- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
-@@ -1040,8 +1040,12 @@ ufs_mem_phy: phy@4807000 {
-                       #size-cells = <2>;
-                       ranges;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      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 756d4f6fb048b4621a824565953d5dc4fb577516..0569b471e112e478515c758dad530b9f7c426d5b 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-sm6115-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8150-switch-ufs-qmp-phy-to-new-styl.patch

diff --git a/queue-6.8/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index ac1df7a..0000000
--- a/queue-6.8/arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 9b3676bb66eaf5cf80bea43080add0b435aceb65 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:31 +0530
-Subject: arm64: dts: qcom: sm6115: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit a820a285ef1b7c7fd94055bbb114c0413c04b96b ]
-
-QMP PHY used in SM6115 requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: 97e563bf5ba1 ("arm64: dts: qcom: sm6115: Add basic soc dtsi")
-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-8-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm6115.dtsi | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi
-index b627c473ffa54..4808982659eda 100644
---- a/arch/arm64/boot/dts/qcom/sm6115.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi
-@@ -1201,8 +1201,12 @@ ufs_mem_phy: phy@4807000 {
-                       compatible = "qcom,sm6115-qmp-ufs-phy";
-                       reg = <0x0 0x04807000 0x0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CLKREF_CLK>;
-+                      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 c4d615f69fe39b5131daa6781188c4cd075a298e..7e5d9e47d7d1496844a9036fc6a8a5cb687607c3 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-sm6115-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6125-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch