| Message ID | 7a4dd667dd86bcf18a68de1426f51cc0f3058244.1449835419.git.michal.simek@xilinx.com |
|---|---|
| State | Superseded |
| Delegated to: | Michal Simek |
| Headers | show |
On Fri, Dec 11, 2015 at 6:03 AM, Michal Simek <michal.simek@xilinx.com> wrote: > Move driver to DM. > > Signed-off-by: Michal Simek <michal.simek@xilinx.com> A few nits below, but otherwise, Acked-by: Joe Hershberger <joe.hershberger@ni.com> > --- > > .../xilinx/microblaze-generic/microblaze-generic.c | 21 --- > board/xilinx/zynq/board.c | 20 --- > configs/microblaze-generic_defconfig | 1 + > drivers/net/xilinx_emaclite.c | 158 ++++++++++++--------- > include/netdev.h | 2 - > 5 files changed, 92 insertions(+), 110 deletions(-) > > diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c > index a3122da9acaa..0e7509d288ce 100644 > --- a/board/xilinx/microblaze-generic/microblaze-generic.c > +++ b/board/xilinx/microblaze-generic/microblaze-generic.c > @@ -12,7 +12,6 @@ > #include <common.h> > #include <config.h> > #include <fdtdec.h> > -#include <netdev.h> > #include <asm/processor.h> > #include <asm/microblaze_intc.h> > #include <asm/asm.h> > @@ -100,23 +99,3 @@ void board_init(void) > { > gpio_init(); > } > - > -int board_eth_init(bd_t *bis) > -{ > - int ret = 0; > - > -#if defined(CONFIG_XILINX_EMACLITE) && defined(XILINX_EMACLITE_BASEADDR) > - u32 txpp = 0; > - u32 rxpp = 0; > -# ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG > - txpp = 1; > -# endif > -# ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG > - rxpp = 1; > -# endif > - ret |= xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR, > - txpp, rxpp); > -#endif > - > - return ret; > -} > diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c > index 427e75485deb..e89b05dffb4c 100644 > --- a/board/xilinx/zynq/board.c > +++ b/board/xilinx/zynq/board.c > @@ -8,7 +8,6 @@ > #include <fdtdec.h> > #include <fpga.h> > #include <mmc.h> > -#include <netdev.h> > #include <zynqpl.h> > #include <asm/arch/hardware.h> > #include <asm/arch/sys_proto.h> > @@ -99,25 +98,6 @@ int checkboard(void) > } > #endif > > -int board_eth_init(bd_t *bis) > -{ > - u32 ret = 0; > - > -#ifdef CONFIG_XILINX_EMACLITE > - u32 txpp = 0; > - u32 rxpp = 0; > -# ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG > - txpp = 1; > -# endif > -# ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG > - rxpp = 1; > -# endif > - ret |= xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR, > - txpp, rxpp); > -#endif > - return ret; > -} > - > int dram_init(void) > { > #if CONFIG_IS_ENABLED(OF_CONTROL) > diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig > index dad05410be50..5e815c6bcdcb 100644 > --- a/configs/microblaze-generic_defconfig > +++ b/configs/microblaze-generic_defconfig > @@ -9,6 +9,7 @@ CONFIG_CMD_GPIO=y > # CONFIG_CMD_SETEXPR is not set > CONFIG_SPL_OF_CONTROL=y > CONFIG_OF_EMBED=y > +CONFIG_DM_ETH=y > CONFIG_PHYLIB=y > CONFIG_SYS_NS16550=y > CONFIG_XILINX_UARTLITE=y > diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c > index b5ff4f099251..06286f267104 100644 > --- a/drivers/net/xilinx_emaclite.c > +++ b/drivers/net/xilinx_emaclite.c > @@ -10,6 +10,7 @@ > #include <common.h> > #include <net.h> > #include <config.h> > +#include <dm.h> > #include <console.h> > #include <malloc.h> > #include <asm/io.h> > @@ -18,7 +19,7 @@ > #include <fdtdec.h> > #include <asm-generic/errno.h> > > -#undef DEBUG > +DECLARE_GLOBAL_DATA_PTR; > > #define ENET_ADDR_LENGTH 6 > > @@ -144,7 +145,6 @@ static void xemaclite_alignedwrite(void *srcptr, u32 *destptr, u32 bytecount) > *to32ptr++ = alignbuffer; > } > > -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) > static int wait_for_bit(const char *func, u32 *reg, const u32 mask, > bool set, unsigned int timeout) > { > @@ -229,9 +229,8 @@ static u32 phywrite(struct xemaclite *emaclite, u32 phyaddress, u32 registernum, > > return 0; > } > -#endif > > -static void emaclite_halt(struct eth_device *dev) > +static void emaclite_halt(struct udevice *dev) > { > debug("eth_halt\n"); > } > @@ -247,12 +246,11 @@ static void emaclite_halt(struct eth_device *dev) > */ > #define PHY_DETECT_MASK 0x1808 > > -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) > -static int setup_phy(struct eth_device *dev) > +static int setup_phy(struct udevice *dev) > { > int i; > u16 phyreg; > - struct xemaclite *emaclite = dev->priv; > + struct xemaclite *emaclite = dev_get_priv(dev); > struct phy_device *phydev; > > u32 supported = SUPPORTED_10baseT_Half | > @@ -312,11 +310,11 @@ static int setup_phy(struct eth_device *dev) > /* Do not setup anything */ > return 1; > } > -#endif > > -static int emaclite_init(struct eth_device *dev, bd_t *bis) > +static int emaclite_init(struct udevice *dev) > { > - struct xemaclite *emaclite = dev->priv; > + struct xemaclite *emaclite = dev_get_priv(dev); > + struct eth_pdata *pdata = dev_get_platdata(dev); > struct emaclite_regs *regs = emaclite->regs; > > debug("EmacLite Initialization Started\n"); > @@ -327,7 +325,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis) > /* Restart PING TX */ > out_be32(®s->tx_ping_tsr, 0); > /* Copy MAC address */ > - xemaclite_alignedwrite(dev->enetaddr, ®s->tx_ping, > + xemaclite_alignedwrite(pdata->enetaddr, ®s->tx_ping, > ENET_ADDR_LENGTH); > /* Set the length */ > out_be32(®s->tx_ping_tplr, ENET_ADDR_LENGTH); > @@ -341,7 +339,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis) > if (emaclite->txpp) { > /* The same operation with PONG TX */ > out_be32(®s->tx_pong_tsr, 0); > - xemaclite_alignedwrite(dev->enetaddr, ®s->tx_pong, > + xemaclite_alignedwrite(pdata->enetaddr, ®s->tx_pong, > ENET_ADDR_LENGTH); > out_be32(®s->tx_pong_tplr, ENET_ADDR_LENGTH); > out_be32(®s->tx_pong_tsr, XEL_TSR_PROG_MAC_ADDR); > @@ -359,12 +357,11 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis) > if (emaclite->rxpp) > out_be32(®s->rx_pong_rsr, XEL_RSR_RECV_IE_MASK); > > -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) > out_be32(®s->mdioctrl, XEL_MDIOCTRL_MDIOEN_MASK); > if (in_be32(®s->mdioctrl) & XEL_MDIOCTRL_MDIOEN_MASK) > if (!setup_phy(dev)) > return -1; > -#endif > + > debug("EmacLite Initialization complete\n"); > return 0; > } > @@ -385,10 +382,10 @@ static int xemaclite_txbufferavailable(struct xemaclite *emaclite) > return !(tmp & XEL_TSR_XMIT_BUSY_MASK); > } > > -static int emaclite_send(struct eth_device *dev, void *ptr, int len) > +static int emaclite_send(struct udevice *dev, void *ptr, int len) > { > u32 reg; > - struct xemaclite *emaclite = dev->priv; > + struct xemaclite *emaclite = dev_get_priv(dev); > struct emaclite_regs *regs = emaclite->regs; > > u32 maxtry = 1000; > @@ -446,7 +443,7 @@ static int emaclite_send(struct eth_device *dev, void *ptr, int len) > return -1; > } > > -static int emaclite_recv(struct eth_device *dev) > +static int emaclite_recv(struct udevice *dev, int flags, uchar **packetp) > { > u32 length; > u32 reg; > @@ -523,78 +520,105 @@ try_again: > > debug("Packet receive from 0x%p, length %dB\n", addr, length); > net_process_received_packet((uchar *)etherrxbuff, length); > - return length; > + return 0; Since there is no clean-up here, it would be better to return the length and remove the net_process_received_packet() call above. > Remove this line. > } > > -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) > -static int emaclite_miiphy_read(const char *devname, uchar addr, > - uchar reg, ushort *val) > +static int emaclite_miiphy_read(struct mii_dev *bus, int addr, > + int devad, int reg) > { > u32 ret; > - struct eth_device *dev = eth_get_dev(); > + u16 val = 0; > > - ret = phyread(dev->priv, addr, reg, val); > - debug("emaclite: Read MII 0x%x, 0x%x, 0x%x\n", addr, reg, *val); > - return ret; > + ret = phyread(bus->priv, addr, reg, &val); > + debug("emaclite: Read MII 0x%x, 0x%x, 0x%x, %d\n", addr, reg, val, ret); > + return val; > } > > -static int emaclite_miiphy_write(const char *devname, uchar addr, > - uchar reg, ushort val) > +static int emaclite_miiphy_write(struct mii_dev *bus, int addr, int devad, > + int reg, u16 value) > { > - struct eth_device *dev = eth_get_dev(); > - > - debug("emaclite: Write MII 0x%x, 0x%x, 0x%x\n", addr, reg, val); > - return phywrite(dev->priv, addr, reg, val); > + debug("emaclite: Write MII 0x%x, 0x%x, 0x%x\n", addr, reg, value); > + return phywrite(bus->priv, addr, reg, value); > } > -#endif > > -int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr, > - int txpp, int rxpp) > +static int emaclite_probe(struct udevice *dev) > { > - struct eth_device *dev; > - struct xemaclite *emaclite; > - struct emaclite_regs *regs; > + struct xemaclite *emaclite = dev_get_priv(dev); > + int ret; > > - dev = calloc(1, sizeof(*dev)); > - if (dev == NULL) > - return -1; > + emaclite->bus = mdio_alloc(); > + emaclite->bus->read = emaclite_miiphy_read; > + emaclite->bus->write = emaclite_miiphy_write; > + emaclite->bus->priv = emaclite; > + strcpy(emaclite->bus->name, "emaclite"); > > - emaclite = calloc(1, sizeof(struct xemaclite)); > - if (emaclite == NULL) { > - free(dev); > - return -1; > - } > + ret = mdio_register(emaclite->bus); > + if (ret) > + return ret; > > - dev->priv = emaclite; > + return 0; > +} > > - emaclite->txpp = txpp; > - emaclite->rxpp = rxpp; > +static int emaclite_remove(struct udevice *dev) > +{ > + struct xemaclite *emaclite = dev_get_priv(dev); > > - sprintf(dev->name, "Xelite.%lx", base_addr); > + free(emaclite->phydev); > + mdio_unregister(emaclite->bus); > + mdio_free(emaclite->bus); > > - emaclite->regs = (struct emaclite_regs *)base_addr; > - regs = emaclite->regs; > - dev->iobase = base_addr; > - dev->init = emaclite_init; > - dev->halt = emaclite_halt; > - dev->send = emaclite_send; > - dev->recv = emaclite_recv; > + return 0; > +} > + > +static const struct eth_ops emaclite_ops = { > + .start = emaclite_init, Name this emaclite_start. > + .send = emaclite_send, > + .recv = emaclite_recv, > + .stop = emaclite_halt, Name this emaclite_stop. > +}; > + > +static int emaclite_ofdata_to_platdata(struct udevice *dev) > +{ > + struct eth_pdata *pdata = dev_get_platdata(dev); > + struct xemaclite *emaclite = dev_get_priv(dev); > + int offset = 0; > + > + pdata->iobase = (phys_addr_t)dev_get_addr(dev); > + emaclite->regs = (struct emaclite_regs *)pdata->iobase; > > -#ifdef CONFIG_PHY_ADDR > - emaclite->phyaddr = CONFIG_PHY_ADDR; > -#else > emaclite->phyaddr = -1; > -#endif > > - eth_register(dev); > + offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset, > + "phy-handle"); > + if (offset > 0) > + emaclite->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, > + "reg", -1); > > -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) > - miiphy_register(dev->name, emaclite_miiphy_read, emaclite_miiphy_write); > - emaclite->bus = miiphy_get_dev_by_name(dev->name); > + emaclite->txpp = fdtdec_get_int(gd->fdt_blob, dev->of_offset, > + "xlnx,tx-ping-pong", 0); > + emaclite->rxpp = fdtdec_get_int(gd->fdt_blob, dev->of_offset, > + "xlnx,rx-ping-pong", 0); > > - out_be32(®s->mdioctrl, XEL_MDIOCTRL_MDIOEN_MASK); > -#endif > + printf("EMACLITE: %lx, phyaddr %d, %d/%d\n", (ulong)emaclite->regs, > + emaclite->phyaddr, emaclite->txpp, emaclite->rxpp); > > - return 1; > + return 0; > } > + > +static const struct udevice_id emaclite_ids[] = { > + { .compatible = "xlnx,xps-ethernetlite-1.00.a" }, > + { } > +}; > + > +U_BOOT_DRIVER(emaclite) = { > + .name = "emaclite", > + .id = UCLASS_ETH, > + .of_match = emaclite_ids, > + .ofdata_to_platdata = emaclite_ofdata_to_platdata, > + .probe = emaclite_probe, > + .remove = emaclite_remove, > + .ops = &emaclite_ops, > + .priv_auto_alloc_size = sizeof(struct xemaclite), > + .platdata_auto_alloc_size = sizeof(struct eth_pdata), > +}; > diff --git a/include/netdev.h b/include/netdev.h > index 9fc41ab11575..244f23f93c36 100644 > --- a/include/netdev.h > +++ b/include/netdev.h > @@ -80,8 +80,6 @@ int tsi108_eth_initialize(bd_t *bis); > int uec_standard_init(bd_t *bis); > int uli526x_initialize(bd_t *bis); > int armada100_fec_register(unsigned long base_addr); > -int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr, > - int txpp, int rxpp); > int xilinx_ll_temac_eth_init(bd_t *bis, unsigned long base_addr, int flags, > unsigned long ctrl_addr); > /* > -- > 1.9.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
On 15.12.2015 23:34, Joe Hershberger wrote: > On Fri, Dec 11, 2015 at 6:03 AM, Michal Simek <michal.simek@xilinx.com> wrote: >> Move driver to DM. >> >> Signed-off-by: Michal Simek <michal.simek@xilinx.com> > > A few nits below, but otherwise, > > Acked-by: Joe Hershberger <joe.hershberger@ni.com> Thanks. >> @@ -523,78 +520,105 @@ try_again: >> >> debug("Packet receive from 0x%p, length %dB\n", addr, length); >> net_process_received_packet((uchar *)etherrxbuff, length); >> - return length; >> + return 0; > > Since there is no clean-up here, it would be better to return the > length and remove the net_process_received_packet() call above. I will send it in separate patch. I wanted to do it in this way to be smaller patch. > >> > > Remove this line. done. >> + >> +static const struct eth_ops emaclite_ops = { >> + .start = emaclite_init, > > Name this emaclite_start. > >> + .send = emaclite_send, >> + .recv = emaclite_recv, >> + .stop = emaclite_halt, > > Name this emaclite_stop. there will be separate patch for this. Thanks, Michal
diff --git a/board/xilinx/microblaze-generic/microblaze-generic.c b/board/xilinx/microblaze-generic/microblaze-generic.c index a3122da9acaa..0e7509d288ce 100644 --- a/board/xilinx/microblaze-generic/microblaze-generic.c +++ b/board/xilinx/microblaze-generic/microblaze-generic.c @@ -12,7 +12,6 @@ #include <common.h> #include <config.h> #include <fdtdec.h> -#include <netdev.h> #include <asm/processor.h> #include <asm/microblaze_intc.h> #include <asm/asm.h> @@ -100,23 +99,3 @@ void board_init(void) { gpio_init(); } - -int board_eth_init(bd_t *bis) -{ - int ret = 0; - -#if defined(CONFIG_XILINX_EMACLITE) && defined(XILINX_EMACLITE_BASEADDR) - u32 txpp = 0; - u32 rxpp = 0; -# ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG - txpp = 1; -# endif -# ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG - rxpp = 1; -# endif - ret |= xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR, - txpp, rxpp); -#endif - - return ret; -} diff --git a/board/xilinx/zynq/board.c b/board/xilinx/zynq/board.c index 427e75485deb..e89b05dffb4c 100644 --- a/board/xilinx/zynq/board.c +++ b/board/xilinx/zynq/board.c @@ -8,7 +8,6 @@ #include <fdtdec.h> #include <fpga.h> #include <mmc.h> -#include <netdev.h> #include <zynqpl.h> #include <asm/arch/hardware.h> #include <asm/arch/sys_proto.h> @@ -99,25 +98,6 @@ int checkboard(void) } #endif -int board_eth_init(bd_t *bis) -{ - u32 ret = 0; - -#ifdef CONFIG_XILINX_EMACLITE - u32 txpp = 0; - u32 rxpp = 0; -# ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG - txpp = 1; -# endif -# ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG - rxpp = 1; -# endif - ret |= xilinx_emaclite_initialize(bis, XILINX_EMACLITE_BASEADDR, - txpp, rxpp); -#endif - return ret; -} - int dram_init(void) { #if CONFIG_IS_ENABLED(OF_CONTROL) diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index dad05410be50..5e815c6bcdcb 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -9,6 +9,7 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_DM_ETH=y CONFIG_PHYLIB=y CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index b5ff4f099251..06286f267104 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -10,6 +10,7 @@ #include <common.h> #include <net.h> #include <config.h> +#include <dm.h> #include <console.h> #include <malloc.h> #include <asm/io.h> @@ -18,7 +19,7 @@ #include <fdtdec.h> #include <asm-generic/errno.h> -#undef DEBUG +DECLARE_GLOBAL_DATA_PTR; #define ENET_ADDR_LENGTH 6 @@ -144,7 +145,6 @@ static void xemaclite_alignedwrite(void *srcptr, u32 *destptr, u32 bytecount) *to32ptr++ = alignbuffer; } -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) static int wait_for_bit(const char *func, u32 *reg, const u32 mask, bool set, unsigned int timeout) { @@ -229,9 +229,8 @@ static u32 phywrite(struct xemaclite *emaclite, u32 phyaddress, u32 registernum, return 0; } -#endif -static void emaclite_halt(struct eth_device *dev) +static void emaclite_halt(struct udevice *dev) { debug("eth_halt\n"); } @@ -247,12 +246,11 @@ static void emaclite_halt(struct eth_device *dev) */ #define PHY_DETECT_MASK 0x1808 -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) -static int setup_phy(struct eth_device *dev) +static int setup_phy(struct udevice *dev) { int i; u16 phyreg; - struct xemaclite *emaclite = dev->priv; + struct xemaclite *emaclite = dev_get_priv(dev); struct phy_device *phydev; u32 supported = SUPPORTED_10baseT_Half | @@ -312,11 +310,11 @@ static int setup_phy(struct eth_device *dev) /* Do not setup anything */ return 1; } -#endif -static int emaclite_init(struct eth_device *dev, bd_t *bis) +static int emaclite_init(struct udevice *dev) { - struct xemaclite *emaclite = dev->priv; + struct xemaclite *emaclite = dev_get_priv(dev); + struct eth_pdata *pdata = dev_get_platdata(dev); struct emaclite_regs *regs = emaclite->regs; debug("EmacLite Initialization Started\n"); @@ -327,7 +325,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis) /* Restart PING TX */ out_be32(®s->tx_ping_tsr, 0); /* Copy MAC address */ - xemaclite_alignedwrite(dev->enetaddr, ®s->tx_ping, + xemaclite_alignedwrite(pdata->enetaddr, ®s->tx_ping, ENET_ADDR_LENGTH); /* Set the length */ out_be32(®s->tx_ping_tplr, ENET_ADDR_LENGTH); @@ -341,7 +339,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis) if (emaclite->txpp) { /* The same operation with PONG TX */ out_be32(®s->tx_pong_tsr, 0); - xemaclite_alignedwrite(dev->enetaddr, ®s->tx_pong, + xemaclite_alignedwrite(pdata->enetaddr, ®s->tx_pong, ENET_ADDR_LENGTH); out_be32(®s->tx_pong_tplr, ENET_ADDR_LENGTH); out_be32(®s->tx_pong_tsr, XEL_TSR_PROG_MAC_ADDR); @@ -359,12 +357,11 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis) if (emaclite->rxpp) out_be32(®s->rx_pong_rsr, XEL_RSR_RECV_IE_MASK); -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) out_be32(®s->mdioctrl, XEL_MDIOCTRL_MDIOEN_MASK); if (in_be32(®s->mdioctrl) & XEL_MDIOCTRL_MDIOEN_MASK) if (!setup_phy(dev)) return -1; -#endif + debug("EmacLite Initialization complete\n"); return 0; } @@ -385,10 +382,10 @@ static int xemaclite_txbufferavailable(struct xemaclite *emaclite) return !(tmp & XEL_TSR_XMIT_BUSY_MASK); } -static int emaclite_send(struct eth_device *dev, void *ptr, int len) +static int emaclite_send(struct udevice *dev, void *ptr, int len) { u32 reg; - struct xemaclite *emaclite = dev->priv; + struct xemaclite *emaclite = dev_get_priv(dev); struct emaclite_regs *regs = emaclite->regs; u32 maxtry = 1000; @@ -446,7 +443,7 @@ static int emaclite_send(struct eth_device *dev, void *ptr, int len) return -1; } -static int emaclite_recv(struct eth_device *dev) +static int emaclite_recv(struct udevice *dev, int flags, uchar **packetp) { u32 length; u32 reg; @@ -523,78 +520,105 @@ try_again: debug("Packet receive from 0x%p, length %dB\n", addr, length); net_process_received_packet((uchar *)etherrxbuff, length); - return length; + return 0; } -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) -static int emaclite_miiphy_read(const char *devname, uchar addr, - uchar reg, ushort *val) +static int emaclite_miiphy_read(struct mii_dev *bus, int addr, + int devad, int reg) { u32 ret; - struct eth_device *dev = eth_get_dev(); + u16 val = 0; - ret = phyread(dev->priv, addr, reg, val); - debug("emaclite: Read MII 0x%x, 0x%x, 0x%x\n", addr, reg, *val); - return ret; + ret = phyread(bus->priv, addr, reg, &val); + debug("emaclite: Read MII 0x%x, 0x%x, 0x%x, %d\n", addr, reg, val, ret); + return val; } -static int emaclite_miiphy_write(const char *devname, uchar addr, - uchar reg, ushort val) +static int emaclite_miiphy_write(struct mii_dev *bus, int addr, int devad, + int reg, u16 value) { - struct eth_device *dev = eth_get_dev(); - - debug("emaclite: Write MII 0x%x, 0x%x, 0x%x\n", addr, reg, val); - return phywrite(dev->priv, addr, reg, val); + debug("emaclite: Write MII 0x%x, 0x%x, 0x%x\n", addr, reg, value); + return phywrite(bus->priv, addr, reg, value); } -#endif -int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr, - int txpp, int rxpp) +static int emaclite_probe(struct udevice *dev) { - struct eth_device *dev; - struct xemaclite *emaclite; - struct emaclite_regs *regs; + struct xemaclite *emaclite = dev_get_priv(dev); + int ret; - dev = calloc(1, sizeof(*dev)); - if (dev == NULL) - return -1; + emaclite->bus = mdio_alloc(); + emaclite->bus->read = emaclite_miiphy_read; + emaclite->bus->write = emaclite_miiphy_write; + emaclite->bus->priv = emaclite; + strcpy(emaclite->bus->name, "emaclite"); - emaclite = calloc(1, sizeof(struct xemaclite)); - if (emaclite == NULL) { - free(dev); - return -1; - } + ret = mdio_register(emaclite->bus); + if (ret) + return ret; - dev->priv = emaclite; + return 0; +} - emaclite->txpp = txpp; - emaclite->rxpp = rxpp; +static int emaclite_remove(struct udevice *dev) +{ + struct xemaclite *emaclite = dev_get_priv(dev); - sprintf(dev->name, "Xelite.%lx", base_addr); + free(emaclite->phydev); + mdio_unregister(emaclite->bus); + mdio_free(emaclite->bus); - emaclite->regs = (struct emaclite_regs *)base_addr; - regs = emaclite->regs; - dev->iobase = base_addr; - dev->init = emaclite_init; - dev->halt = emaclite_halt; - dev->send = emaclite_send; - dev->recv = emaclite_recv; + return 0; +} + +static const struct eth_ops emaclite_ops = { + .start = emaclite_init, + .send = emaclite_send, + .recv = emaclite_recv, + .stop = emaclite_halt, +}; + +static int emaclite_ofdata_to_platdata(struct udevice *dev) +{ + struct eth_pdata *pdata = dev_get_platdata(dev); + struct xemaclite *emaclite = dev_get_priv(dev); + int offset = 0; + + pdata->iobase = (phys_addr_t)dev_get_addr(dev); + emaclite->regs = (struct emaclite_regs *)pdata->iobase; -#ifdef CONFIG_PHY_ADDR - emaclite->phyaddr = CONFIG_PHY_ADDR; -#else emaclite->phyaddr = -1; -#endif - eth_register(dev); + offset = fdtdec_lookup_phandle(gd->fdt_blob, dev->of_offset, + "phy-handle"); + if (offset > 0) + emaclite->phyaddr = fdtdec_get_int(gd->fdt_blob, offset, + "reg", -1); -#if defined(CONFIG_MII) || defined(CONFIG_CMD_MII) || defined(CONFIG_PHYLIB) - miiphy_register(dev->name, emaclite_miiphy_read, emaclite_miiphy_write); - emaclite->bus = miiphy_get_dev_by_name(dev->name); + emaclite->txpp = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + "xlnx,tx-ping-pong", 0); + emaclite->rxpp = fdtdec_get_int(gd->fdt_blob, dev->of_offset, + "xlnx,rx-ping-pong", 0); - out_be32(®s->mdioctrl, XEL_MDIOCTRL_MDIOEN_MASK); -#endif + printf("EMACLITE: %lx, phyaddr %d, %d/%d\n", (ulong)emaclite->regs, + emaclite->phyaddr, emaclite->txpp, emaclite->rxpp); - return 1; + return 0; } + +static const struct udevice_id emaclite_ids[] = { + { .compatible = "xlnx,xps-ethernetlite-1.00.a" }, + { } +}; + +U_BOOT_DRIVER(emaclite) = { + .name = "emaclite", + .id = UCLASS_ETH, + .of_match = emaclite_ids, + .ofdata_to_platdata = emaclite_ofdata_to_platdata, + .probe = emaclite_probe, + .remove = emaclite_remove, + .ops = &emaclite_ops, + .priv_auto_alloc_size = sizeof(struct xemaclite), + .platdata_auto_alloc_size = sizeof(struct eth_pdata), +}; diff --git a/include/netdev.h b/include/netdev.h index 9fc41ab11575..244f23f93c36 100644 --- a/include/netdev.h +++ b/include/netdev.h @@ -80,8 +80,6 @@ int tsi108_eth_initialize(bd_t *bis); int uec_standard_init(bd_t *bis); int uli526x_initialize(bd_t *bis); int armada100_fec_register(unsigned long base_addr); -int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr, - int txpp, int rxpp); int xilinx_ll_temac_eth_init(bd_t *bis, unsigned long base_addr, int flags, unsigned long ctrl_addr); /*
Move driver to DM. Signed-off-by: Michal Simek <michal.simek@xilinx.com> --- .../xilinx/microblaze-generic/microblaze-generic.c | 21 --- board/xilinx/zynq/board.c | 20 --- configs/microblaze-generic_defconfig | 1 + drivers/net/xilinx_emaclite.c | 158 ++++++++++++--------- include/netdev.h | 2 - 5 files changed, 92 insertions(+), 110 deletions(-)