Drop arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch

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

diff --git a/queue-5.15/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch b/queue-5.15/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
deleted file mode 100644 (file)
index e92a47f..0000000
--- a/queue-5.15/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 6136c5fead9a0000a1b0f4d6bf8072d4e35ec926 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 06:25:50 +0300
-Subject: arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit ba865bdcc688932980b8e5ec2154eaa33cd4a981 ]
-
-Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
-resource region, no per-PHY subnodes).
-
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20231205032552.1583336-8-dmitry.baryshkov@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Stable-dep-of: 55ee02b10bdd ("arm64: dts: qcom: sm8250: Fix UFS PHY clocks")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++--------------
- 1 file changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
-index 8880e9cbc9743..71705b760c8b1 100644
---- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
-@@ -1702,7 +1702,7 @@ ufs_mem_hc: ufshc@1d84000 {
-                                    "jedec,ufs-2.0";
-                       reg = <0 0x01d84000 0 0x3000>;
-                       interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
--                      phys = <&ufs_mem_phy_lanes>;
-+                      phys = <&ufs_mem_phy>;
-                       phy-names = "ufsphy";
-                       lanes-per-direction = <2>;
-                       #reset-cells = <1>;
-@@ -1746,10 +1746,8 @@ ufs_mem_hc: ufshc@1d84000 {
- 
-               ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8250-qmp-ufs-phy";
--                      reg = <0 0x01d87000 0 0x1c0>;
--                      #address-cells = <2>;
--                      #size-cells = <2>;
--                      ranges;
-+                      reg = <0 0x01d87000 0 0x1000>;
-+
-                       clock-names = "ref",
-                                     "ref_aux";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
-@@ -1757,16 +1755,10 @@ ufs_mem_phy: phy@1d87000 {
- 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
--                      status = "disabled";
- 
--                      ufs_mem_phy_lanes: phy@1d87400 {
--                              reg = <0 0x01d87400 0 0x16c>,
--                                    <0 0x01d87600 0 0x200>,
--                                    <0 0x01d87c00 0 0x200>,
--                                    <0 0x01d87800 0 0x16c>,
--                                    <0 0x01d87a00 0 0x200>;
--                              #phy-cells = <0>;
--                      };
-+                      #phy-cells = <0>;
-+
-+                      status = "disabled";
-               };
- 
-               ipa_virt: interconnect@1e00000 {
--- 
-2.43.0
-

diff --git a/queue-5.15/series b/queue-5.15/series
index b5e86c8a5ff6eac305b5be2d17a7a8f1db667dfd..8f82abc81fcefda6a87a5b4c718746e4f8927e11 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-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
 printk-add-panic_in_progress-helper.patch
 printk-disable-passing-console-lock-owner-completely.patch
 pwm-sti-implement-.apply-callback.patch

diff --git a/queue-6.1/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch b/queue-6.1/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
deleted file mode 100644 (file)
index 51ce348..0000000
--- a/queue-6.1/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 566ddfe20e0225d7f2e05cee0446b313965a46bc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 06:25:50 +0300
-Subject: arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit ba865bdcc688932980b8e5ec2154eaa33cd4a981 ]
-
-Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
-resource region, no per-PHY subnodes).
-
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20231205032552.1583336-8-dmitry.baryshkov@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Stable-dep-of: 55ee02b10bdd ("arm64: dts: qcom: sm8250: Fix UFS PHY clocks")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++--------------
- 1 file changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
-index 3d02adbc0b62f..194fb00051d66 100644
---- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
-@@ -2125,7 +2125,7 @@ ufs_mem_hc: ufshc@1d84000 {
-                                    "jedec,ufs-2.0";
-                       reg = <0 0x01d84000 0 0x3000>;
-                       interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
--                      phys = <&ufs_mem_phy_lanes>;
-+                      phys = <&ufs_mem_phy>;
-                       phy-names = "ufsphy";
-                       lanes-per-direction = <2>;
-                       #reset-cells = <1>;
-@@ -2169,10 +2169,8 @@ ufs_mem_hc: ufshc@1d84000 {
- 
-               ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8250-qmp-ufs-phy";
--                      reg = <0 0x01d87000 0 0x1c0>;
--                      #address-cells = <2>;
--                      #size-cells = <2>;
--                      ranges;
-+                      reg = <0 0x01d87000 0 0x1000>;
-+
-                       clock-names = "ref",
-                                     "ref_aux";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
-@@ -2180,16 +2178,10 @@ ufs_mem_phy: phy@1d87000 {
- 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
--                      status = "disabled";
- 
--                      ufs_mem_phy_lanes: phy@1d87400 {
--                              reg = <0 0x01d87400 0 0x16c>,
--                                    <0 0x01d87600 0 0x200>,
--                                    <0 0x01d87c00 0 0x200>,
--                                    <0 0x01d87800 0 0x16c>,
--                                    <0 0x01d87a00 0 0x200>;
--                              #phy-cells = <0>;
--                      };
-+                      #phy-cells = <0>;
-+
-+                      status = "disabled";
-               };
- 
-               ipa_virt: interconnect@1e00000 {
--- 
-2.43.0
-

diff --git a/queue-6.1/series b/queue-6.1/series
index 3f7a7a2c0bc0dbee1f9b8eba5477089d3e128d2e..0d07b031c7e32658f2fbd2bef78bb139c2d22c0f 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-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
 arm64-dts-qcom-sc8280xp-update-ufs-phy-nodes.patch
 printk-disable-passing-console-lock-owner-completely.patch
 pwm-sti-fix-capture-for-st-pwm-num-chan-st-capture-n.patch

diff --git a/queue-6.6/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch b/queue-6.6/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
deleted file mode 100644 (file)
index 88cd231..0000000
--- a/queue-6.6/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From 951e0cef849ee510007f740c239b2c584c83a0de Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 06:25:50 +0300
-Subject: arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit ba865bdcc688932980b8e5ec2154eaa33cd4a981 ]
-
-Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
-resource region, no per-PHY subnodes).
-
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20231205032552.1583336-8-dmitry.baryshkov@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Stable-dep-of: 55ee02b10bdd ("arm64: dts: qcom: sm8250: Fix UFS PHY clocks")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++--------------
- 1 file changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
-index 64a656dcfa1f5..a67a12b466f34 100644
---- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
-@@ -2169,7 +2169,7 @@ ufs_mem_hc: ufshc@1d84000 {
-                                    "jedec,ufs-2.0";
-                       reg = <0 0x01d84000 0 0x3000>;
-                       interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
--                      phys = <&ufs_mem_phy_lanes>;
-+                      phys = <&ufs_mem_phy>;
-                       phy-names = "ufsphy";
-                       lanes-per-direction = <2>;
-                       #reset-cells = <1>;
-@@ -2217,10 +2217,8 @@ ufs_mem_hc: ufshc@1d84000 {
- 
-               ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8250-qmp-ufs-phy";
--                      reg = <0 0x01d87000 0 0x1c0>;
--                      #address-cells = <2>;
--                      #size-cells = <2>;
--                      ranges;
-+                      reg = <0 0x01d87000 0 0x1000>;
-+
-                       clock-names = "ref",
-                                     "ref_aux";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
-@@ -2228,16 +2226,10 @@ ufs_mem_phy: phy@1d87000 {
- 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
--                      status = "disabled";
- 
--                      ufs_mem_phy_lanes: phy@1d87400 {
--                              reg = <0 0x01d87400 0 0x16c>,
--                                    <0 0x01d87600 0 0x200>,
--                                    <0 0x01d87c00 0 0x200>,
--                                    <0 0x01d87800 0 0x16c>,
--                                    <0 0x01d87a00 0 0x200>;
--                              #phy-cells = <0>;
--                      };
-+                      #phy-cells = <0>;
-+
-+                      status = "disabled";
-               };
- 
-               cryptobam: dma-controller@1dc4000 {
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 0fd8641a628f86ebe04d947804010ee810ff8b1c..216344dc6c90dd7e2ef9851b70fb595410bf0d92 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-sm8250-switch-ufs-qmp-phy-to-new-styl.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-sm8250-switch-ufs-qmp-phy-to-new-styl.patch b/queue-6.7/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
deleted file mode 100644 (file)
index 58a35d7..0000000
--- a/queue-6.7/arm64-dts-qcom-sm8250-switch-ufs-qmp-phy-to-new-styl.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From f45fde3c1e9af3b39f2868fabe543f7214796743 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Tue, 5 Dec 2023 06:25:50 +0300
-Subject: arm64: dts: qcom: sm8250: switch UFS QMP PHY to new style of bindings
-
-From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-
-[ Upstream commit ba865bdcc688932980b8e5ec2154eaa33cd4a981 ]
-
-Change the UFS QMP PHY to use newer style of QMP PHY bindings (single
-resource region, no per-PHY subnodes).
-
-Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
-Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-Link: https://lore.kernel.org/r/20231205032552.1583336-8-dmitry.baryshkov@linaro.org
-Signed-off-by: Bjorn Andersson <andersson@kernel.org>
-Stable-dep-of: 55ee02b10bdd ("arm64: dts: qcom: sm8250: Fix UFS PHY clocks")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/arm64/boot/dts/qcom/sm8250.dtsi | 20 ++++++--------------
- 1 file changed, 6 insertions(+), 14 deletions(-)
-
-diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
-index d59a99ca872c0..ed111145afd2d 100644
---- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
-+++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
-@@ -2434,7 +2434,7 @@ ufs_mem_hc: ufshc@1d84000 {
-                                    "jedec,ufs-2.0";
-                       reg = <0 0x01d84000 0 0x3000>;
-                       interrupts = <GIC_SPI 265 IRQ_TYPE_LEVEL_HIGH>;
--                      phys = <&ufs_mem_phy_lanes>;
-+                      phys = <&ufs_mem_phy>;
-                       phy-names = "ufsphy";
-                       lanes-per-direction = <2>;
-                       #reset-cells = <1>;
-@@ -2482,10 +2482,8 @@ ufs_mem_hc: ufshc@1d84000 {
- 
-               ufs_mem_phy: phy@1d87000 {
-                       compatible = "qcom,sm8250-qmp-ufs-phy";
--                      reg = <0 0x01d87000 0 0x1c0>;
--                      #address-cells = <2>;
--                      #size-cells = <2>;
--                      ranges;
-+                      reg = <0 0x01d87000 0 0x1000>;
-+
-                       clock-names = "ref",
-                                     "ref_aux";
-                       clocks = <&rpmhcc RPMH_CXO_CLK>,
-@@ -2493,16 +2491,10 @@ ufs_mem_phy: phy@1d87000 {
- 
-                       resets = <&ufs_mem_hc 0>;
-                       reset-names = "ufsphy";
--                      status = "disabled";
- 
--                      ufs_mem_phy_lanes: phy@1d87400 {
--                              reg = <0 0x01d87400 0 0x16c>,
--                                    <0 0x01d87600 0 0x200>,
--                                    <0 0x01d87c00 0 0x200>,
--                                    <0 0x01d87800 0 0x16c>,
--                                    <0 0x01d87a00 0 0x200>;
--                              #phy-cells = <0>;
--                      };
-+                      #phy-cells = <0>;
-+
-+                      status = "disabled";
-               };
- 
-               cryptobam: dma-controller@1dc4000 {
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index 458169c6ad77b5573ad0f9227b22373d9b5e9f69..d17b1da89b8501e227f47253414fc47f347386d2 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-sm8250-switch-ufs-qmp-phy-to-new-styl.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