Drop net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch

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

diff --git a/queue-5.10/net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch b/queue-5.10/net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch
deleted file mode 100644 (file)
index 8087de2..0000000
--- a/queue-5.10/net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 28449e8fa1319f4ae07be9705d1f69747565d54a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 20 Mar 2023 22:05:20 +0300
-Subject: net: dsa: mt7530: move setting ssc_delta to PHY_INTERFACE_MODE_TRGMII
- case
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Arınç ÜNAL <arinc.unal@arinc9.com>
-
-[ Upstream commit 407b508bdd70b6848993843d96ed49ac4108fb52 ]
-
-Move setting the ssc_delta variable to under the PHY_INTERFACE_MODE_TRGMII
-case as it's only needed when trgmii is used.
-
-Fixes: b8f126a8d543 ("net-next: dsa: add dsa support for Mediatek MT7530 switch")
-Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
-Link: https://lore.kernel.org/r/20230320190520.124513-3-arinc.unal@arinc9.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/dsa/mt7530.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
-index 70155e996f7d7..821ac2984282b 100644
---- a/drivers/net/dsa/mt7530.c
-+++ b/drivers/net/dsa/mt7530.c
-@@ -403,6 +403,10 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface)
-               break;
-       case PHY_INTERFACE_MODE_TRGMII:
-               trgint = 1;
-+              if (xtal == HWTRAP_XTAL_25MHZ)
-+                      ssc_delta = 0x57;
-+              else
-+                      ssc_delta = 0x87;
-               if (priv->id == ID_MT7621) {
-                       /* PLL frequency: 150MHz: 1.2GBit */
-                       if (xtal == HWTRAP_XTAL_40MHZ)
-@@ -422,11 +426,6 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, phy_interface_t interface)
-               return -EINVAL;
-       }
- 
--      if (xtal == HWTRAP_XTAL_25MHZ)
--              ssc_delta = 0x57;
--      else
--              ssc_delta = 0x87;
--
-       mt7530_rmw(priv, MT7530_P6ECR, P6_INTF_MODE_MASK,
-                  P6_INTF_MODE(trgint));
- 
--- 
-2.39.2
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 694603a54f11b0242df3c0ccd1d00b967c10d090..bf34466d5b5afeec0bf7a9c73da3b26c09cc82e9 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -48,7 +48,6 @@ erspan-do-not-use-skb_mac_header-in-ndo_start_xmit.patch
 net-sonic-use-dma_mapping_error-for-error-check.patch
 nvme-tcp-fix-nvme_tcp_term_pdu-to-match-spec.patch
 gve-cache-link_speed-value-from-device.patch
-net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch
 net-mdio-thunder-add-missing-fwnode_handle_put.patch
 bluetooth-btqcomsmd-fix-command-timeout-after-settin.patch
 bluetooth-l2cap-fix-not-checking-for-maximum-number-.patch

diff --git a/queue-5.4/net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch b/queue-5.4/net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch
deleted file mode 100644 (file)
index 59667ac..0000000
--- a/queue-5.4/net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 35b6a1d7f4572ada18248b0852d00c254d13181f Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Mon, 20 Mar 2023 22:05:20 +0300
-Subject: net: dsa: mt7530: move setting ssc_delta to PHY_INTERFACE_MODE_TRGMII
- case
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Arınç ÜNAL <arinc.unal@arinc9.com>
-
-[ Upstream commit 407b508bdd70b6848993843d96ed49ac4108fb52 ]
-
-Move setting the ssc_delta variable to under the PHY_INTERFACE_MODE_TRGMII
-case as it's only needed when trgmii is used.
-
-Fixes: b8f126a8d543 ("net-next: dsa: add dsa support for Mediatek MT7530 switch")
-Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
-Link: https://lore.kernel.org/r/20230320190520.124513-3-arinc.unal@arinc9.com
-Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/dsa/mt7530.c | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
-index 2d8382eb9add3..5bd282cb3d9f2 100644
---- a/drivers/net/dsa/mt7530.c
-+++ b/drivers/net/dsa/mt7530.c
-@@ -396,6 +396,10 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, int mode)
-               break;
-       case PHY_INTERFACE_MODE_TRGMII:
-               trgint = 1;
-+              if (xtal == HWTRAP_XTAL_25MHZ)
-+                      ssc_delta = 0x57;
-+              else
-+                      ssc_delta = 0x87;
-               if (priv->id == ID_MT7621) {
-                       /* PLL frequency: 150MHz: 1.2GBit */
-                       if (xtal == HWTRAP_XTAL_40MHZ)
-@@ -414,11 +418,6 @@ mt7530_pad_clk_setup(struct dsa_switch *ds, int mode)
-               return -EINVAL;
-       }
- 
--      if (xtal == HWTRAP_XTAL_25MHZ)
--              ssc_delta = 0x57;
--      else
--              ssc_delta = 0x87;
--
-       mt7530_rmw(priv, MT7530_P6ECR, P6_INTF_MODE_MASK,
-                  P6_INTF_MODE(trgint));
- 
--- 
-2.39.2
-

diff --git a/queue-5.4/series b/queue-5.4/series
index b7b5e36647e0c7bb30bab6b23dfbca92ab24cc26..9c207ee8be457f4e7894c2fb852aa76a6881cce0 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -20,7 +20,6 @@ erspan-do-not-use-skb_mac_header-in-ndo_start_xmit.patch
 net-sonic-use-dma_mapping_error-for-error-check.patch
 nvme-tcp-fix-nvme_tcp_term_pdu-to-match-spec.patch
 hvc-xen-prevent-concurrent-accesses-to-the-shared-ri.patch
-net-dsa-mt7530-move-setting-ssc_delta-to-phy_interfa.patch
 net-mdio-thunder-add-missing-fwnode_handle_put.patch
 bluetooth-btqcomsmd-fix-command-timeout-after-settin.patch
 bluetooth-btsdio-fix-use-after-free-bug-in-btsdio_re.patch