mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
f7d0a4797f
Backport commits adding support for the MT7988 built-in switch to the
mt7530 driver.
This change results in the Kconfig symbol NET_DSA_MT7530 to be extended
by NET_DSA_MT7530_MDIO (everything formally covered by NET_DSA_MT7530)
and NET_DSA_MT7530_MMIO (a new driver for the MMIO-connected built-in
switch of the MT7988 SoC).
Select NET_DSA_MT7530_MDIO for all targets previously selecting
NET_DSA_MT7530, with the exception of mediatek/filogic which also
selects NET_DSA_MT7530_MMIO.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
(cherry picked from commit 958fdf36e3)
55 lines
1.5 KiB
Diff
55 lines
1.5 KiB
Diff
From 6de2852297737171ba96b91e89bf302ca1fda869 Mon Sep 17 00:00:00 2001
|
|
From: Daniel Golle <daniel@makrotopia.org>
|
|
Date: Mon, 3 Apr 2023 02:18:04 +0100
|
|
Subject: [PATCH 08/16] net: dsa: mt7530: move SGMII PCS creation to
|
|
mt7530_probe function
|
|
|
|
Move creating the SGMII PCS from mt753x_setup() to the more appropriate
|
|
mt7530_probe() function.
|
|
This is done also in preparation of moving all functions related to
|
|
MDIO-connected MT753x switches to a separate module.
|
|
|
|
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 | 13 +++++++------
|
|
1 file changed, 7 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/mt7530.c
|
|
+++ b/drivers/net/dsa/mt7530.c
|
|
@@ -3007,12 +3007,6 @@ mt753x_setup(struct dsa_switch *ds)
|
|
if (ret && priv->irq)
|
|
mt7530_free_irq_common(priv);
|
|
|
|
- if (priv->id == ID_MT7531) {
|
|
- ret = mt7531_create_sgmii(priv);
|
|
- if (ret && priv->irq)
|
|
- mt7530_free_irq_common(priv);
|
|
- }
|
|
-
|
|
return ret;
|
|
}
|
|
|
|
@@ -3129,6 +3123,7 @@ mt7530_probe(struct mdio_device *mdiodev
|
|
static struct regmap_config *regmap_config;
|
|
struct mt7530_priv *priv;
|
|
struct device_node *dn;
|
|
+ int ret;
|
|
|
|
dn = mdiodev->dev.of_node;
|
|
|
|
@@ -3221,6 +3216,12 @@ mt7530_probe(struct mdio_device *mdiodev
|
|
if (IS_ERR(priv->regmap))
|
|
return PTR_ERR(priv->regmap);
|
|
|
|
+ if (priv->id == ID_MT7531) {
|
|
+ ret = mt7531_create_sgmii(priv);
|
|
+ if (ret)
|
|
+ return ret;
|
|
+ }
|
|
+
|
|
return dsa_register_switch(priv->ds);
|
|
}
|
|
|