kernel: backport MT7988 DSA support for Linux 6.1

[openwrt/openwrt.git] / target / linux / generic / backport-6.1 / 790-v6.4-0007-net-dsa-mt7530-move-p5_intf_modes-function-to-mt7530.patch

diff --git a/target/linux/generic/backport-6.1/790-v6.4-0007-net-dsa-mt7530-move-p5_intf_modes-function-to-mt7530.patch b/target/linux/generic/backport-6.1/790-v6.4-0007-net-dsa-mt7530-move-p5_intf_modes-function-to-mt7530.patch
new file mode 100644 (file)
index 0000000..5065d73
--- /dev/null
+++ b/target/linux/generic/backport-6.1/790-v6.4-0007-net-dsa-mt7530-move-p5_intf_modes-function-to-mt7530.patch
@@ -0,0 +1,75 @@
+From 0d7ae94a0c581f86939bebec0b6ccd66e640d1d8 Mon Sep 17 00:00:00 2001
+From: Daniel Golle <daniel@makrotopia.org>
+Date: Mon, 3 Apr 2023 02:18:28 +0100
+Subject: [PATCH 07/13] net: dsa: mt7530: move p5_intf_modes() function to
+ mt7530.c
+
+In preparation of splitting mt7530.c into a driver for MDIO-connected
+as well as MDIO-accessed built-in switches on one hand and MMIO-accessed
+built-in switches move the p5_inft_modes() function from mt7530.h to
+mt7530.c. The function is only needed there and will trigger a compiler
+warning about a defined but unused function otherwise when including
+mt7530.h in the to-be-introduced bus-specific drivers.
+
+Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Reviewed-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+---
+ drivers/net/dsa/mt7530.c | 18 ++++++++++++++++++
+ drivers/net/dsa/mt7530.h | 18 ------------------
+ 2 files changed, 18 insertions(+), 18 deletions(-)
+
+--- a/drivers/net/dsa/mt7530.c
++++ b/drivers/net/dsa/mt7530.c
+@@ -950,6 +950,24 @@ mt7530_set_ageing_time(struct dsa_switch
+       return 0;
+ }
+ 
++static const char *p5_intf_modes(unsigned int p5_interface)
++{
++      switch (p5_interface) {
++      case P5_DISABLED:
++              return "DISABLED";
++      case P5_INTF_SEL_PHY_P0:
++              return "PHY P0";
++      case P5_INTF_SEL_PHY_P4:
++              return "PHY P4";
++      case P5_INTF_SEL_GMAC5:
++              return "GMAC5";
++      case P5_INTF_SEL_GMAC5_SGMII:
++              return "GMAC5_SGMII";
++      default:
++              return "unknown";
++      }
++}
++
+ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
+ {
+       struct mt7530_priv *priv = ds->priv;
+--- a/drivers/net/dsa/mt7530.h
++++ b/drivers/net/dsa/mt7530.h
+@@ -682,24 +682,6 @@ enum p5_interface_select {
+       P5_INTF_SEL_GMAC5_SGMII,
+ };
+ 
+-static const char *p5_intf_modes(unsigned int p5_interface)
+-{
+-      switch (p5_interface) {
+-      case P5_DISABLED:
+-              return "DISABLED";
+-      case P5_INTF_SEL_PHY_P0:
+-              return "PHY P0";
+-      case P5_INTF_SEL_PHY_P4:
+-              return "PHY P4";
+-      case P5_INTF_SEL_GMAC5:
+-              return "GMAC5";
+-      case P5_INTF_SEL_GMAC5_SGMII:
+-              return "GMAC5_SGMII";
+-      default:
+-              return "unknown";
+-      }
+-}
+-
+ struct mt7530_priv;
+ 
+ struct mt753x_pcs {