treewide: backport support for nvmem on non platform devices

[openwrt/staging/wigyori.git] / target / linux / lantiq / patches-5.10 / 0028-NET-lantiq-various-etop-fixes.patch

diff --git a/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch b/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch
index 441aaed05b22f37d06382cf7e5cc67f476654c84..0a42fd59e4663f0539afc6bd16aedea621fe6a36 100644 (file)
--- a/target/linux/lantiq/patches-5.10/0028-NET-lantiq-various-etop-fixes.patch
+++ b/target/linux/lantiq/patches-5.10/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;
-@@ -618,14 +822,19 @@ static const struct net_device_ops ltq_e
+@@ -618,14 +822,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) {
-@@ -651,31 +860,64 @@ ltq_etop_probe(struct platform_device *p
+@@ -651,31 +860,62 @@ ltq_etop_probe(struct platform_device *p
                goto err_out;
        }
  
@@ -785,9 +784,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      if (err)
 +              pr_err("Can't find phy-mode for port\n");
 +
-+      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))