82 lines
2.7 KiB
Diff
82 lines
2.7 KiB
Diff
|
From 2f507aaeb1a12044f2376a255c2afff1f7432b0b Mon Sep 17 00:00:00 2001
|
|||
|
|
From: =?UTF-8?q?Ar=C4=B1n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>
|
|||
|
|
Date: Fri, 1 Mar 2024 12:42:57 +0200
|
|||
|
|
Subject: [PATCH 37/48] net: dsa: mt7530: remove .mac_port_config for MT7988
|
|||
|
|
and make it optional
|
|||
|
|
MIME-Version: 1.0
|
|||
|
|
Content-Type: text/plain; charset=UTF-8
|
|||
|
|
Content-Transfer-Encoding: 8bit
|
|||
|
|
|
|||
|
|
For the switch on the MT7988 SoC, the mac_port_config member for ID_MT7988
|
|||
|
|
in mt753x_table is not needed as the interfaces of all MACs are already
|
|||
|
|
handled on mt7988_mac_port_get_caps().
|
|||
|
|
|
|||
|
|
Therefore, remove the mac_port_config member from ID_MT7988 in
|
|||
|
|
mt753x_table. Before calling priv->info->mac_port_config(), if there's no
|
|||
|
|
mac_port_config member in mt753x_table, exit mt753x_mac_config()
|
|||
|
|
successfully.
|
|||
|
|
|
|||
|
|
Remove calling priv->info->mac_port_config() from the sanity check as the
|
|||
|
|
sanity check requires a pointer to a mac_port_config function to be
|
|||
|
|
non-NULL. This will fail for MT7988 as mac_port_config won't be a member of
|
|||
|
|
its info table.
|
|||
|
|
|
|||
|
|
Co-developed-by: Daniel Golle <daniel@makrotopia.org>
|
|||
|
|
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
|
|||
|
|
Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
|
|||
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|||
|
|
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
|
|||
|
|
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
|
|||
|
|
---
|
|||
|
|
drivers/net/dsa/mt7530.c | 18 ++++--------------
|
|||
|
|
1 file changed, 4 insertions(+), 14 deletions(-)
|
|||
|
|
|
|||
|
|
--- a/drivers/net/dsa/mt7530.c
|
|||
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|||
|
|
@@ -2683,17 +2683,6 @@ static bool mt753x_is_mac_port(u32 port)
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
static int
|
|||
|
|
-mt7988_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
|
|||
|
|
- phy_interface_t interface)
|
|||
|
|
-{
|
|||
|
|
- if (dsa_is_cpu_port(ds, port) &&
|
|||
|
|
- interface == PHY_INTERFACE_MODE_INTERNAL)
|
|||
|
|
- return 0;
|
|||
|
|
-
|
|||
|
|
- return -EINVAL;
|
|||
|
|
-}
|
|||
|
|
-
|
|||
|
|
-static int
|
|||
|
|
mt7531_mac_config(struct dsa_switch *ds, int port, unsigned int mode,
|
|||
|
|
phy_interface_t interface)
|
|||
|
|
{
|
|||
|
|
@@ -2733,6 +2722,9 @@ mt753x_mac_config(struct dsa_switch *ds,
|
|||
|
|
{
|
|||
|
|
struct mt7530_priv *priv = ds->priv;
|
|||
|
|
|
|||
|
|
+ if (!priv->info->mac_port_config)
|
|||
|
|
+ return 0;
|
|||
|
|
+
|
|||
|
|
return priv->info->mac_port_config(ds, port, mode, state->interface);
|
|||
|
|
}
|
|||
|
|
|
|||
|
|
@@ -3193,7 +3185,6 @@ const struct mt753x_info mt753x_table[]
|
|||
|
|
.phy_write = mt7531_ind_phy_write,
|
|||
|
|
.cpu_port_config = mt7988_cpu_port_config,
|
|||
|
|
.mac_port_get_caps = mt7988_mac_port_get_caps,
|
|||
|
|
- .mac_port_config = mt7988_mac_config,
|
|||
|
|
},
|
|||
|
|
};
|
|||
|
|
EXPORT_SYMBOL_GPL(mt753x_table);
|
|||
|
|
@@ -3221,8 +3212,7 @@ mt7530_probe_common(struct mt7530_priv *
|
|||
|
|
* properly.
|
|||
|
|
*/
|
|||
|
|
if (!priv->info->sw_setup || !priv->info->phy_read ||
|
|||
|
|
- !priv->info->phy_write || !priv->info->mac_port_get_caps ||
|
|||
|
|
- !priv->info->mac_port_config)
|
|||
|
|
+ !priv->info->phy_write || !priv->info->mac_port_get_caps)
|
|||
|
|
return -EINVAL;
|
|||
|
|
|
|||
|
|
priv->id = priv->info->id;
|