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

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

diff --git a/queue-5.15/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch b/queue-5.15/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 3cf67eb..0000000
--- a/queue-5.15/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 74efc2fe8b4e20ff3b3bf9c5479840ce6f690ad9 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:34 +0530
-Subject: arm64: dts: qcom: sm8150: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit eff7496b72810ca54da8c9c4542bf2aca479dd44 ]
-
-QMP PHY used in SM8150 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: 3834a2e92229 ("arm64: dts: qcom: sm8150: 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-11-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8150.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-index c00840219a45d..860162cdd606c 100644
---- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-@@ -1681,10 +1681,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8150-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-5.15/series b/queue-5.15/series
index 4f0a96365336ed2675b57e14dbc2d36fcb470848..803fcba0be0e1813693766e03cbdbf698da17c25 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -88,7 +88,6 @@ 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-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
 arm64-dts-qcom-sm8250-fix-ufs-phy-clocks.patch
 printk-add-panic_in_progress-helper.patch

diff --git a/queue-6.1/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch b/queue-6.1/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 656f372..0000000
--- a/queue-6.1/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e30bcdf7fcb554f69bb94045f5eb38372c67c018 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:34 +0530
-Subject: arm64: dts: qcom: sm8150: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit eff7496b72810ca54da8c9c4542bf2aca479dd44 ]
-
-QMP PHY used in SM8150 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: 3834a2e92229 ("arm64: dts: qcom: sm8150: 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-11-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8150.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-index 0c2981feb3c8c..1b7a26c55331c 100644
---- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-@@ -2026,10 +2026,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8150-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";
- 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
- 
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index f11e5d8f7968e0ba00780e76b7cb487a29483a70..4371f37e399dedd52d3edfb2320d333676958967 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -128,7 +128,6 @@ 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-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
 arm64-dts-qcom-sm8250-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sc8280xp-update-ufs-phy-nodes.patch

diff --git a/queue-6.6/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 61e91e2..0000000
--- a/queue-6.6/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 70885543a2eb114f56107d82ca48fd2877dcf706 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:34 +0530
-Subject: arm64: dts: qcom: sm8150: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit eff7496b72810ca54da8c9c4542bf2aca479dd44 ]
-
-QMP PHY used in SM8150 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: 3834a2e92229 ("arm64: dts: qcom: sm8150: 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-11-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8150.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-index c3ba152a8202d..0aabcfbe25033 100644
---- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-@@ -2079,10 +2079,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8150-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";
- 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
- 
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 4916e77e32e52d6c0e04fda11e4356184f1afe68..b75f08d24be81bde571228a059afcd6122a81195 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-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
 arm64-dts-qcom-sm8250-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8350-switch-ufs-qmp-phy-to-new-styl.patch

diff --git a/queue-6.7/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 5b3939d..0000000
--- a/queue-6.7/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 134b74164af059eef227434375ffd59a6c72f4f5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:34 +0530
-Subject: arm64: dts: qcom: sm8150: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit eff7496b72810ca54da8c9c4542bf2aca479dd44 ]
-
-QMP PHY used in SM8150 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: 3834a2e92229 ("arm64: dts: qcom: sm8150: 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-11-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8150.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-index 7a57acbe19acc..22854d5036214 100644
---- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-@@ -2063,10 +2063,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8150-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";
- 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
- 
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index c84f5820317ac6ad72ff67bff249720d9919fbc2..2193bc5961c4965282d185632e00bbce4ed339ee 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-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
 arm64-dts-qcom-sm8250-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8350-switch-ufs-qmp-phy-to-new-styl.patch

diff --git a/queue-6.8/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 3766c44..0000000
--- a/queue-6.8/arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a681cf6c94a6c717a36f1367a6e1d39374156496 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:34 +0530
-Subject: arm64: dts: qcom: sm8150: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit eff7496b72810ca54da8c9c4542bf2aca479dd44 ]
-
-QMP PHY used in SM8150 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: 3834a2e92229 ("arm64: dts: qcom: sm8150: 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-11-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8150.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-index 761a6757dc26f..d44b799b1c511 100644
---- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
-@@ -2063,10 +2063,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8150-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";
- 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
- 
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 6e199faccab59ff82ff4882bf9d3ea95b7dddc7b..e78aa7fb02ef58cf0b65eae03c8cad5d7c178cee 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-sm8150-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8250-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8350-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm8550-fix-ufs-phy-clocks.patch