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

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

diff --git a/queue-6.1/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch b/queue-6.1/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 8d91092..0000000
--- a/queue-6.1/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 1154c3a467b6aa7ffbef75370e18c4c3cfff3141 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:37 +0530
-Subject: arm64: dts: qcom: sc8280xp: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 1d4ef9644e219202ed89ac42f3e1defebcab9c7d ]
-
-QMP PHY used in SC8280XP requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPMh
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-14-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-index 88140ce104a44..57937fdd1e790 100644
---- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-@@ -889,9 +889,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sc8280xp-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_CARD_CLKREF_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CARD_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
- 
-@@ -951,9 +954,12 @@ ufs_card_phy: phy@1da7000 {
-                       compatible = "qcom,sc8280xp-qmp-ufs-phy";
-                       reg = <0 0x01da7000 0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_1_CARD_CLKREF_CLK>,
--                               <&gcc GCC_UFS_CARD_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_CARD_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_1_CARD_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       power-domains = <&gcc UFS_CARD_GDSC>;
- 
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 24ed62e059c324a45f64b0d17b5f9c111c551fca..4d3e5ecb27a0a039efddf4027a192a27c89ea758 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -135,7 +135,6 @@ 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
-arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
 printk-disable-passing-console-lock-owner-completely.patch
 pwm-sti-fix-capture-for-st-pwm-num-chan-st-capture-n.patch
 tools-resolve_btfids-refactor-set-sorting-with-types.patch

diff --git a/queue-6.6/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index bb39e0c..0000000
--- a/queue-6.6/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 1ba174627e2f7a08614d663d0fc669f563d02110 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:37 +0530
-Subject: arm64: dts: qcom: sc8280xp: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 1d4ef9644e219202ed89ac42f3e1defebcab9c7d ]
-
-QMP PHY used in SC8280XP requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPMh
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-14-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-index b8081513176ac..8732a510245c8 100644
---- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-@@ -2256,9 +2256,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sc8280xp-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_CARD_CLKREF_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CARD_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
- 
-@@ -2318,9 +2321,12 @@ ufs_card_phy: phy@1da7000 {
-                       compatible = "qcom,sc8280xp-qmp-ufs-phy";
-                       reg = <0 0x01da7000 0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_1_CARD_CLKREF_CLK>,
--                               <&gcc GCC_UFS_CARD_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_CARD_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_1_CARD_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       power-domains = <&gcc UFS_CARD_GDSC>;
- 
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 36b0daf71b9bf2f5cdd248c1da8dc83c7400df0b..2d5acecb9bcc38d72f0d535f62d97c956f11a397 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -196,7 +196,6 @@ 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-fix-ufs-phy-clocks.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

diff --git a/queue-6.7/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 3f48de1..0000000
--- a/queue-6.7/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From f96256045c7e5939008f0f7182934c2443150014 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:37 +0530
-Subject: arm64: dts: qcom: sc8280xp: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 1d4ef9644e219202ed89ac42f3e1defebcab9c7d ]
-
-QMP PHY used in SC8280XP requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPMh
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-14-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-index b8081513176ac..8732a510245c8 100644
---- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-@@ -2256,9 +2256,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sc8280xp-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_CARD_CLKREF_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CARD_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
- 
-@@ -2318,9 +2321,12 @@ ufs_card_phy: phy@1da7000 {
-                       compatible = "qcom,sc8280xp-qmp-ufs-phy";
-                       reg = <0 0x01da7000 0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_1_CARD_CLKREF_CLK>,
--                               <&gcc GCC_UFS_CARD_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_CARD_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_1_CARD_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       power-domains = <&gcc UFS_CARD_GDSC>;
- 
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 2e7e5c26f97bedc73672134e5f4835d183af6818..e8a3d4d8f94b687c6d7a7232dc935a7599daf1cf 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -221,7 +221,6 @@ 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-fix-ufs-phy-clocks.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

diff --git a/queue-6.8/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index c96576e..0000000
--- a/queue-6.8/arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From ded687f305f7c8f497b2f71fd79cc0644d622ffc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:37 +0530
-Subject: arm64: dts: qcom: sc8280xp: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit 1d4ef9644e219202ed89ac42f3e1defebcab9c7d ]
-
-QMP PHY used in SC8280XP requires 3 clocks:
-
-* ref - 19.2MHz reference clock from RPMh
-* ref_aux - Auxiliary reference clock from GCC
-* qref - QREF clock from GCC
-
-Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform")
-Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-Link: https://lore.kernel.org/r/20240131-ufs-phy-clock-v3-14-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 18 ++++++++++++------
- 1 file changed, 12 insertions(+), 6 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-index febf28356ff8b..bb0786ab2864d 100644
---- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi
-@@ -2257,9 +2257,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sc8280xp-qmp-ufs-phy";
-                       reg = <0 0x01d87000 0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_CARD_CLKREF_CLK>,
--                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_PHY_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_CARD_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       power-domains = <&gcc UFS_PHY_GDSC>;
- 
-@@ -2319,9 +2322,12 @@ ufs_card_phy: phy@1da7000 {
-                       compatible = "qcom,sc8280xp-qmp-ufs-phy";
-                       reg = <0 0x01da7000 0 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_1_CARD_CLKREF_CLK>,
--                               <&gcc GCC_UFS_CARD_PHY_AUX_CLK>;
--                      clock-names = "ref", "ref_aux";
-+                      clocks = <&rpmhcc RPMH_CXO_CLK>,
-+                               <&gcc GCC_UFS_CARD_PHY_AUX_CLK>,
-+                               <&gcc GCC_UFS_1_CARD_CLKREF_CLK>;
-+                      clock-names = "ref",
-+                                    "ref_aux",
-+                                    "qref";
- 
-                       power-domains = <&gcc UFS_CARD_GDSC>;
- 
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 1030e965016bfacf94b66c85192856bd719779ae..6d01f351f3d23302995826d37a6f1bf0b3ee5168 100644 (file)
--- a/queue-6.8/series
+++ b/queue-6.8/series
@@ -160,7 +160,6 @@ 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
 arm64-dts-qcom-sm8250-fix-ufs-phy-clocks.patch
-arm64-dts-qcom-sc8280xp-fix-ufs-phy-clocks.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