6bf179b270
Switch to the mainline Lantiq PCIe PHY driver and update the vr9.dtsi
accordingly.
The Lantiq IRQ SMP support added upstream required changes to the SoC
dtsi as well.
Following changes are made to the Lantiq kernel patches:
0005-lantiq_etop-pass-struct-device-to-DMA-API-functions.patch
0006-MIPS-lantiq-pass-struct-device-to-DMA-API-functions.patch
applied upstream
0008-MIPS-lantiq-backport-old-timer-code.patch
access_ok API update because it lost it's type (which was the first)
parameter in upstream commit 96d4f267e40f95 ("Remove 'type' argument
from access_ok() function")
0024-MIPS-lantiq-autoselect-soc-rev-matching-fw.patch
merged into 0026-MIPS-lantiq-Add-GPHY-Firmware-loader.patch
0024-MIPS-lantiq-revert-DSA-switch-driver-PMU-clock-chang.patch
revert upstream changes required for upstream xrx200 ethernet and
xrx200 (DSA) switch driver but breaking our driver
0026-MIPS-lantiq-Add-GPHY-Firmware-loader.patch
required for our driver but dropped upstream, add former upstream
version
0028-NET-lantiq-various-etop-fixes.patch
now has to use the phy_set_max_speed API instead of modifying
phydev->supported. Also call ltq_dma_enable_irq() in
ltq_etop_open() based on upstream commit cc973aecf0b054 ("MIPS:
lantiq: Do not enable IRQs in dma open")
Signed-off-by: Mathias Kresin <dev@kresin.me>
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
38 lines
989 B
Diff
38 lines
989 B
Diff
--- a/drivers/net/ethernet/lantiq_etop.c
|
|
+++ b/drivers/net/ethernet/lantiq_etop.c
|
|
@@ -30,6 +30,7 @@
|
|
#include <linux/of_net.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
+#include <linux/of_mdio.h>
|
|
|
|
#include <asm/checksum.h>
|
|
|
|
@@ -553,7 +554,8 @@ static int
|
|
ltq_etop_mdio_init(struct net_device *dev)
|
|
{
|
|
struct ltq_etop_priv *priv = netdev_priv(dev);
|
|
- int err;
|
|
+ struct device_node *mdio_np = NULL;
|
|
+ int err, ret;
|
|
|
|
priv->mii_bus = mdiobus_alloc();
|
|
if (!priv->mii_bus) {
|
|
@@ -573,7 +575,15 @@ ltq_etop_mdio_init(struct net_device *de
|
|
priv->mii_bus->name = "ltq_mii";
|
|
snprintf(priv->mii_bus->id, MII_BUS_ID_SIZE, "%s-%x",
|
|
priv->pdev->name, priv->pdev->id);
|
|
- if (mdiobus_register(priv->mii_bus)) {
|
|
+
|
|
+ mdio_np = of_get_child_by_name(priv->pdev->dev.of_node, "mdio-bus");
|
|
+
|
|
+ if (mdio_np)
|
|
+ ret = of_mdiobus_register(priv->mii_bus, mdio_np);
|
|
+ else
|
|
+ ret = mdiobus_register(priv->mii_bus);
|
|
+
|
|
+ if (ret) {
|
|
err = -ENXIO;
|
|
goto err_out_free_mdiobus;
|
|
}
|