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

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

diff --git a/queue-5.15/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-5.15/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 5d6c152..0000000
--- a/queue-5.15/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f61c4cd0daa7867eea38d1b04ac1ad68ff1e27df Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:30 +0530
-Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ]
-
-QMP PHY used in SDM845 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: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller")
-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-7-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-index 06e160ee00dd1..f83f83dd56a53 100644
---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-@@ -2292,10 +2292,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sdm845-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 c7cb2b8731eb484bb754103f6c0c1e2476a8c571..db0f93e24b73714a7f71fc1ab0b458d29e0a3a48 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-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
-arm64-dts-qcom-sdm845-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.1/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-6.1/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 77a0379..0000000
--- a/queue-6.1/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b351fbd5629067255d82687b9d71be5fb2b658a7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:30 +0530
-Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ]
-
-QMP PHY used in SDM845 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: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller")
-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-7-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-index 8d2c78083ee49..b613c58bb43b6 100644
---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-@@ -2530,10 +2530,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sdm845-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.1/series b/queue-6.1/series
index 4d3e5ecb27a0a039efddf4027a192a27c89ea758..b24ce516b13a35172767f8b44c537960866b05c0 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-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
-arm64-dts-qcom-sdm845-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
 arm64-dts-qcom-sm8150-fix-ufs-phy-clocks.patch

diff --git a/queue-6.6/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 5f912ba..0000000
--- a/queue-6.6/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From cde03fd26754e56381267b93224746d25daab592 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:30 +0530
-Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ]
-
-QMP PHY used in SDM845 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: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller")
-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-7-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-index 1ce71d70daa01..5f5c1b3bdeee8 100644
---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-@@ -2627,10 +2627,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sdm845-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.6/series b/queue-6.6/series
index 2d5acecb9bcc38d72f0d535f62d97c956f11a397..7f7345b5dad0cc425f29c9af5abd2c83281fbb96 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-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
-arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.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

diff --git a/queue-6.7/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 3e48de2..0000000
--- a/queue-6.7/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 99f9513ffb6899563d12a59c3abe28ee977d2cf4 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:30 +0530
-Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ]
-
-QMP PHY used in SDM845 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: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller")
-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-7-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-index 4d1396325f667..5fda325e4f45e 100644
---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-@@ -2617,10 +2617,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sdm845-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.7/series b/queue-6.7/series
index e8a3d4d8f94b687c6d7a7232dc935a7599daf1cf..6718bcbf86b9d5b93f4e112c42b58b54f8893ef6 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-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
-arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.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

diff --git a/queue-6.8/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 1df41dc..0000000
--- a/queue-6.8/arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From aee7a0f6fc799a34d1bb8d2795c35ed907ba84b6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:30 +0530
-Subject: arm64: dts: qcom: sdm845: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit ca8fb2bd2248ae05890c011d691ba5d4a1e7d8d6 ]
-
-QMP PHY used in SDM845 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: cc16687fbd74 ("arm64: dts: qcom: sdm845: add UFS controller")
-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-7-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sdm845.dtsi | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sdm845.dtsi b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-index c2244824355a2..5ee98ff84d171 100644
---- a/arch/arm64/boot/dts/qcom/sdm845.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sdm845.dtsi
-@@ -2639,10 +2639,12 @@ ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sdm845-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 6d01f351f3d23302995826d37a6f1bf0b3ee5168..c4d615f69fe39b5131daa6781188c4cd075a298e 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-sdm845-fix-ufs-phy-clocks.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