x86: timer: tsc: Allow specifying clock rate from device tree again

[u-boot] / drivers / net / xilinx_emaclite.c

diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index d86e7a3954645e59f8563eb999c110b5812c0cd6..4b49290f0e4efb36329168b946b9e8d99d2d949d 100644 (file)
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -1,10 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2007-2009 Michal Simek
  * (C) Copyright 2003 Xilinx Inc.
  *
  * Michal SIMEK <monstr@monstr.eu>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
@@ -17,7 +16,7 @@
 #include <phy.h>
 #include <miiphy.h>
 #include <fdtdec.h>
-#include <asm-generic/errno.h>
+#include <linux/errno.h>
 #include <linux/kernel.h>
 #include <asm/io.h>
 
@@ -566,9 +565,8 @@ static int emaclite_probe(struct udevice *dev)
        emaclite->bus->read = emaclite_miiphy_read;
        emaclite->bus->write = emaclite_miiphy_write;
        emaclite->bus->priv = emaclite;
-       strcpy(emaclite->bus->name, "emaclite");
 
-       ret = mdio_register(emaclite->bus);
+       ret = mdio_register_seq(emaclite->bus, dev->seq);
        if (ret)
                return ret;
 
@@ -599,21 +597,21 @@ static int emaclite_ofdata_to_platdata(struct udevice *dev)
        struct xemaclite *emaclite = dev_get_priv(dev);
        int offset = 0;
 
-       pdata->iobase = (phys_addr_t)dev_get_addr(dev);
+       pdata->iobase = (phys_addr_t)devfdt_get_addr(dev);
        emaclite->regs = (struct emaclite_regs *)ioremap_nocache(pdata->iobase,
                                                                 0x10000);
 
        emaclite->phyaddr = -1;
 
-       offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset,
+       offset = fdtdec_lookup_phandle(gd->fdt_blob, dev_of_offset(dev),
                                      "phy-handle");
        if (offset > 0)
                emaclite->phyaddr = fdtdec_get_int(gd->fdt_blob, offset,
                                                   "reg", -1);
 
-       emaclite->txpp = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+       emaclite->txpp = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                        "xlnx,tx-ping-pong", 0);
-       emaclite->rxpp = fdtdec_get_int(gd->fdt_blob, dev->of_offset,
+       emaclite->rxpp = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
                                        "xlnx,rx-ping-pong", 0);
 
        printf("EMACLITE: %lx, phyaddr %d, %d/%d\n", (ulong)emaclite->regs,