mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
5714660643
Manually rebased:
backport-5.15/603-v5.19-page_pool-Add-recycle-stats-to-page_pool_put_page_bu.patch
pending-5.15/723-net-mt7531-ensure-all-MACs-are-powered-down-before-r.patch*
Removed upstreamed:
generic-backport/610-v6.3-net-page_pool-use-in_softirq-instead.patch[1]
backport-5.15/705-12-v6.0-net-dsa-mt7530-rework-mt753-01-_setup.patch[2]
backport-5.15/790-v6.4-0010-net-dsa-mt7530-split-off-common-parts-from-mt7531_se.patch[3]
backport-5.15/703-10-v5.16-net-dsa-introduce-helpers-for-iterating-through-port.patch[4]
All other patches automatically rebased.
* Modified to define the variable i as suggested by DragonBluep in PR discussion.
See: https://github.com/openwrt/openwrt/pull/12823#issuecomment-1578518576
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=3af319d5147454dc63665ef451229c674b538377
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=0753c1ef24194580f7165ae6e259b59a851392f2
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.115&id=5a7266feaa6d708fc6880a161786eaa884ef3c8e
4. 9902f91cf6
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
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
|
|
@@ -3022,12 +3022,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;
|
|
}
|
|
|
|
@@ -3144,6 +3138,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;
|
|
|
|
@@ -3236,6 +3231,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);
|
|
}
|
|
|