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

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

diff --git a/queue-5.10/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch b/queue-5.10/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index e0a2d34..0000000
--- a/queue-5.10/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f9ae001bedcecd607c19b4ec716fd1bb4c42edd1 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:28 +0530
-Subject: arm64: dts: qcom: msm8996: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit c83fdb4335cec507d685ba9661ed7c4ccbaf12ff ]
-
-QMP PHY used in MSM8996 requires 2 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* qref - QREF clock from GCC
-
-Fixes: 27520210e881 ("arm64: dts: qcom: msm8996: Use generic QMP driver for UFS")
-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-5-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index d766f3b5c03ec..1fdb03c86135f 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -954,8 +954,8 @@ ufsphy: phy@627000 {
-                       #size-cells = <1>;
-                       ranges;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>;
--                      clock-names = "ref";
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK>, <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref", "qref";
- 
-                       resets = <&ufshc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index f65a7e57c6dd04227805dc43172732851cec264c..a0563b4d1a9c87c4f2b7e5858fbac2b8e47415a5 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -57,7 +57,6 @@ wifi-iwlwifi-dbg-tlv-ensure-nul-termination.patch
 wifi-iwlwifi-fix-ewrd-table-validity-check.patch
 net-blackhole_dev-fix-build-warning-for-ethh-set-but.patch
 wifi-libertas-fix-some-memleaks-in-lbs_allocate_cmd_.patch
-arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 printk-add-panic_in_progress-helper.patch
 printk-disable-passing-console-lock-owner-completely.patch

diff --git a/queue-5.15/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch b/queue-5.15/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index eab524b..0000000
--- a/queue-5.15/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From fb8a9ed2b5929925bb3ffa570d7e700b06f1ce87 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:28 +0530
-Subject: arm64: dts: qcom: msm8996: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit c83fdb4335cec507d685ba9661ed7c4ccbaf12ff ]
-
-QMP PHY used in MSM8996 requires 2 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* qref - QREF clock from GCC
-
-Fixes: 27520210e881 ("arm64: dts: qcom: msm8996: Use generic QMP driver for UFS")
-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-5-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index e8fe02f484bf2..224b9f0f156a1 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -1783,8 +1783,8 @@ ufsphy: phy@627000 {
-                       #size-cells = <1>;
-                       ranges;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>;
--                      clock-names = "ref";
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK>, <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref", "qref";
- 
-                       resets = <&ufshc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 3c2504a5995641a36fe6cc27fdd9699fa0ee857f..f336344c113a4873010045c93e6a70a8cb22ec66 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -87,7 +87,6 @@ arm64-dts-qcom-msm8996-move-clock-cells-to-qmp-phy-c.patch
 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-msm8996-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch

diff --git a/queue-6.1/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch b/queue-6.1/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index daf8871..0000000
--- a/queue-6.1/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From c3679931eb04023b2fcd1babf8cf02d21d7a0386 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:28 +0530
-Subject: arm64: dts: qcom: msm8996: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit c83fdb4335cec507d685ba9661ed7c4ccbaf12ff ]
-
-QMP PHY used in MSM8996 requires 2 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* qref - QREF clock from GCC
-
-Fixes: 27520210e881 ("arm64: dts: qcom: msm8996: Use generic QMP driver for UFS")
-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-5-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index 789121171a110..7400ff24e6a01 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -2043,8 +2043,8 @@ ufsphy: phy@627000 {
-                       #size-cells = <1>;
-                       ranges;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>;
--                      clock-names = "ref";
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK>, <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref", "qref";
- 
-                       resets = <&ufshc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index db1c132eacc1d5d5ac021055a04795e5a30b31e2..f43c94c3300ef712fa1bde18467eefab508505e4 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-msm8996-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch

diff --git a/queue-6.6/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch b/queue-6.6/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 35309ff..0000000
--- a/queue-6.6/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 0a686cf3ca2886a10c601ffa33a98ab302759f12 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:28 +0530
-Subject: arm64: dts: qcom: msm8996: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit c83fdb4335cec507d685ba9661ed7c4ccbaf12ff ]
-
-QMP PHY used in MSM8996 requires 2 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* qref - QREF clock from GCC
-
-Fixes: 27520210e881 ("arm64: dts: qcom: msm8996: Use generic QMP driver for UFS")
-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-5-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index 4d87cba47c764..0d924203ef8ca 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -2117,8 +2117,8 @@ ufsphy: phy@627000 {
-                       #size-cells = <1>;
-                       ranges;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>;
--                      clock-names = "ref";
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK>, <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref", "qref";
- 
-                       resets = <&ufshc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 2532d19b88be52904bd917d2acf7f718f9813f51..5a244432b7e5e0aaaa1b5db6ffcb949218026ee9 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-msm8996-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch

diff --git a/queue-6.7/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch b/queue-6.7/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index 42fbaa7..0000000
--- a/queue-6.7/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1300b769e50f7f711f51949bb4400e6c8b860741 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:28 +0530
-Subject: arm64: dts: qcom: msm8996: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit c83fdb4335cec507d685ba9661ed7c4ccbaf12ff ]
-
-QMP PHY used in MSM8996 requires 2 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* qref - QREF clock from GCC
-
-Fixes: 27520210e881 ("arm64: dts: qcom: msm8996: Use generic QMP driver for UFS")
-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-5-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index fa8ec92ce4904..b7afd7c47a02e 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -2118,8 +2118,8 @@ ufsphy: phy@627000 {
-                       #size-cells = <1>;
-                       ranges;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>;
--                      clock-names = "ref";
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK>, <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref", "qref";
- 
-                       resets = <&ufshc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 9449c62cb06a61b5ced18610da4ed32e6e7f257b..00dca2fc5367168f29f2baad0450a78d21d32067 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-msm8996-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch

diff --git a/queue-6.8/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch b/queue-6.8/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
deleted file mode 100644 (file)
index d363f4b..0000000
--- a/queue-6.8/arm64-dts-qcom-msm8996-fix-ufs-phy-clocks.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6d7ea5f8f533c6a08cbd1f35b8981881c24c82a7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 31 Jan 2024 12:37:28 +0530
-Subject: arm64: dts: qcom: msm8996: Fix UFS PHY clocks
-
-From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
-
-[ Upstream commit c83fdb4335cec507d685ba9661ed7c4ccbaf12ff ]
-
-QMP PHY used in MSM8996 requires 2 clocks:
-
-* ref - 19.2MHz reference clock from RPM
-* qref - QREF clock from GCC
-
-Fixes: 27520210e881 ("arm64: dts: qcom: msm8996: Use generic QMP driver for UFS")
-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-5-58a49d2f4605@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-index ee6f87c828aef..a66f2f8ef3be5 100644
---- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
-+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
-@@ -2096,8 +2096,8 @@ ufsphy: phy@627000 {
-                       compatible = "qcom,msm8996-qmp-ufs-phy";
-                       reg = <0x00627000 0x1000>;
- 
--                      clocks = <&gcc GCC_UFS_CLKREF_CLK>;
--                      clock-names = "ref";
-+                      clocks = <&rpmcc RPM_SMD_LN_BB_CLK>, <&gcc GCC_UFS_CLKREF_CLK>;
-+                      clock-names = "ref", "qref";
- 
-                       resets = <&ufshc 0>;
-                       reset-names = "ufsphy";
--- 
-2.43.0
-

diff --git a/queue-6.8/series b/queue-6.8/series
index 095797ab1c53c8701bbf863f40053f10b5c2500a..b3c249de2548e03928205772515632ec4067d25d 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-msm8996-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-msm8998-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sdm845-fix-ufs-phy-clocks.patch
 arm64-dts-qcom-sm6115-fix-ufs-phy-clocks.patch