aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch')
-rw-r--r--target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch9
1 files changed, 3 insertions, 6 deletions
diff --git a/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch
index 094496a16d..12a71fdad1 100644
--- a/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch
+++ b/target/linux/lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch
@@ -721,7 +721,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
netif_trans_update(dev);
netif_wake_queue(dev);
return;
-@@ -625,14 +829,19 @@ static const struct net_device_ops ltq_e
+@@ -625,14 +829,18 @@ static const struct net_device_ops ltq_e
.ndo_tx_timeout = ltq_etop_tx_timeout,
};
@@ -733,7 +733,6 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
struct ltq_etop_priv *priv;
- struct resource *res;
+ struct resource *res, *gbit_res, irqres[2];
-+ const u8 *mac;
int err;
- int i;
+
@@ -745,7 +744,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
-@@ -658,31 +867,62 @@ ltq_etop_probe(struct platform_device *p
+@@ -658,31 +867,60 @@ ltq_etop_probe(struct platform_device *p
goto err_out;
}
@@ -783,9 +782,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ priv->rx_irq = irqres[1].start;
+ priv->mii_mode = of_get_phy_mode(pdev->dev.of_node);
+
-+ mac = of_get_mac_address(pdev->dev.of_node);
-+ if (mac)
-+ memcpy(priv->mac, mac, ETH_ALEN);
++ of_get_mac_address(pdev->dev.of_node, priv->mac);
+
+ priv->clk_ppe = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(priv->clk_ppe))