mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
0263cb3835
Uses upstream DSA switch modules (rtl8365mb, rtl8366), similar to RTL8367C and rtl8366rb swconfig drivers. The package dependencies exclude targets built without kernel CONFIG_OF. It also fixes the rtl8366rb LED support. Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com> Signed-off-by: Robert Marko <robimarko@gmail.com>
84 lines
2.7 KiB
Diff
84 lines
2.7 KiB
Diff
From 68c66d8d8a19088967a0ab6bb98cb5ecc80ca0be Mon Sep 17 00:00:00 2001
|
|
From: Luiz Angelo Daros de Luca <luizluca@gmail.com>
|
|
Date: Fri, 9 Feb 2024 02:03:44 -0300
|
|
Subject: net: dsa: realtek: clean slave_mii_bus setup
|
|
|
|
Remove the line assigning dev.of_node in mdio_bus as subsequent
|
|
of_mdiobus_register will always overwrite it.
|
|
|
|
As discussed in [1], allow the DSA core to be simplified, by not
|
|
assigning ds->slave_mii_bus when the MDIO bus is described in OF, as it
|
|
is unnecessary.
|
|
|
|
Since commit 3b73a7b8ec38 ("net: mdio_bus: add refcounting for fwnodes
|
|
to mdiobus"), we can put the "mdio" node just after the MDIO bus
|
|
registration.
|
|
|
|
[1] https://lkml.kernel.org/netdev/20231213120656.x46fyad6ls7sqyzv@skbuf/T/#u
|
|
|
|
Signed-off-by: Luiz Angelo Daros de Luca <luizluca@gmail.com>
|
|
Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
|
|
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/dsa/realtek/realtek-smi.c | 13 +++----------
|
|
1 file changed, 3 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/dsa/realtek/realtek-smi.c
|
|
+++ b/drivers/net/dsa/realtek/realtek-smi.c
|
|
@@ -331,7 +331,7 @@ static int realtek_smi_setup_mdio(struct
|
|
{
|
|
struct realtek_priv *priv = ds->priv;
|
|
struct device_node *mdio_np;
|
|
- int ret;
|
|
+ int ret = 0;
|
|
|
|
mdio_np = of_get_child_by_name(priv->dev->of_node, "mdio");
|
|
if (!mdio_np) {
|
|
@@ -344,15 +344,14 @@ static int realtek_smi_setup_mdio(struct
|
|
ret = -ENOMEM;
|
|
goto err_put_node;
|
|
}
|
|
+
|
|
priv->slave_mii_bus->priv = priv;
|
|
priv->slave_mii_bus->name = "SMI slave MII";
|
|
priv->slave_mii_bus->read = realtek_smi_mdio_read;
|
|
priv->slave_mii_bus->write = realtek_smi_mdio_write;
|
|
snprintf(priv->slave_mii_bus->id, MII_BUS_ID_SIZE, "SMI-%d",
|
|
ds->index);
|
|
- priv->slave_mii_bus->dev.of_node = mdio_np;
|
|
priv->slave_mii_bus->parent = priv->dev;
|
|
- ds->slave_mii_bus = priv->slave_mii_bus;
|
|
|
|
ret = devm_of_mdiobus_register(priv->dev, priv->slave_mii_bus, mdio_np);
|
|
if (ret) {
|
|
@@ -361,8 +360,6 @@ static int realtek_smi_setup_mdio(struct
|
|
goto err_put_node;
|
|
}
|
|
|
|
- return 0;
|
|
-
|
|
err_put_node:
|
|
of_node_put(mdio_np);
|
|
|
|
@@ -428,8 +425,7 @@ EXPORT_SYMBOL_NS_GPL(realtek_smi_probe,
|
|
* @pdev: platform_device to be removed.
|
|
*
|
|
* This function should be used as the .remove_new in a platform_driver. First
|
|
- * it unregisters the DSA switch and cleans internal data. Finally, it calls
|
|
- * the common remove function.
|
|
+ * it unregisters the DSA switch and then it calls the common remove function.
|
|
*
|
|
* Context: Can sleep.
|
|
* Return: Nothing.
|
|
@@ -443,9 +439,6 @@ void realtek_smi_remove(struct platform_
|
|
|
|
rtl83xx_unregister_switch(priv);
|
|
|
|
- if (priv->slave_mii_bus)
|
|
- of_node_put(priv->slave_mii_bus->dev.of_node);
|
|
-
|
|
rtl83xx_remove(priv);
|
|
}
|
|
EXPORT_SYMBOL_NS_GPL(realtek_smi_remove, REALTEK_DSA);
|