From 419ae85d4418ced203475ab4fbbfc1d37d8ea14e Mon Sep 17 00:00:00 2001 From: Jan Luebbe Date: Fri, 28 Sep 2012 18:17:45 +0200 Subject: davinci_emac: adjust to new phylib framework Also pass flags using platform_data and remove useless casts from void*. Signed-off-by: Jan Luebbe Acked-by: Jean-Christophe PLAGNIOL-VILLARD Signed-off-by: Sascha Hauer --- drivers/net/Kconfig | 2 +- drivers/net/davinci_emac.c | 79 +++++++++++++++++++++++++++------------------- 2 files changed, 47 insertions(+), 34 deletions(-) (limited to 'drivers') diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig index b15bb8ea92..877099f969 100644 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@ -48,7 +48,7 @@ config DRIVER_NET_SMC91111 config DRIVER_NET_DAVINCI_EMAC bool "TI Davinci/OMAP EMAC ethernet driver" depends on ARCH_DAVINCI || ARCH_OMAP3 - select MIIDEV + select PHYLIB config DRIVER_NET_DM9K bool "Davicom dm9k[E|A|B] ethernet driver" diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c index 7f39972bd8..91fd226919 100644 --- a/drivers/net/davinci_emac.c +++ b/drivers/net/davinci_emac.c @@ -43,18 +43,19 @@ #include #include #include -#include #include #include #include #include +#include #include +#include #include "davinci_emac.h" struct davinci_emac_priv { struct device_d *dev; struct eth_device edev; - struct mii_device miidev; + struct mii_bus miibus; /* EMAC Addresses */ void __iomem *adap_emac; /* = EMAC_BASE_ADDR */ @@ -72,8 +73,10 @@ struct davinci_emac_priv { /* Receive packet buffers */ unsigned char *emac_rx_buffers; /* [EMAC_MAX_RX_BUFFERS * (EMAC_MAX_ETHERNET_PKT_SIZE + EMAC_PKT_ALIGN)] */ - /* PHY address for a discovered PHY (0xff - not found) */ - uint8_t active_phy_addr; /* = 0xff */ + /* PHY-specific information */ + phy_interface_t interface; + uint8_t phy_addr; + uint32_t phy_flags; /* mac_addr[0] goes out on the wire first */ uint8_t mac_addr[6]; @@ -149,7 +152,6 @@ static int davinci_eth_phy_read(struct davinci_emac_priv *priv, uint8_t phy_addr /* Write to a PHY register via MDIO inteface. Blocks until operation is complete. */ static int davinci_eth_phy_write(struct davinci_emac_priv *priv, uint8_t phy_addr, uint8_t reg_num, uint16_t data) { - while (readl(priv->adap_mdio + EMAC_MDIO_USERACCESS0) & MDIO_USERACCESS0_GO); dev_dbg(priv->dev, "emac_phy_write: addr=0x%02x reg=0x%02x data=0x%04x\n", @@ -167,16 +169,16 @@ static int davinci_eth_phy_write(struct davinci_emac_priv *priv, uint8_t phy_add return 1; } -static int davinci_miidev_read(struct mii_device *dev, int addr, int reg) +static int davinci_miibus_read(struct mii_bus *bus, int addr, int reg) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)dev->edev->priv; + struct davinci_emac_priv *priv = bus->priv; uint16_t value = 0; return davinci_eth_phy_read(priv, addr, reg, &value) ? value : -1; } -static int davinci_miidev_write(struct mii_device *dev, int addr, int reg, int value) +static int davinci_miibus_write(struct mii_bus *bus, int addr, int reg, u16 value) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)dev->edev->priv; + struct davinci_emac_priv *priv = (struct davinci_emac_priv *)bus->priv; return davinci_eth_phy_write(priv, addr, reg, value) ? 0 : -1; } @@ -191,7 +193,7 @@ static int davinci_emac_get_ethaddr(struct eth_device *edev, unsigned char *adr) */ static int davinci_emac_set_ethaddr(struct eth_device *edev, unsigned char *addr) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)edev->priv; + struct davinci_emac_priv *priv = edev->priv; int i; for (i = 0; i < sizeof(priv->mac_addr); i++) @@ -207,7 +209,7 @@ static int davinci_emac_init(struct eth_device *edev) static int davinci_emac_open(struct eth_device *edev) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)edev->priv; + struct davinci_emac_priv *priv = edev->priv; uint32_t clkdiv, cnt; void __iomem *rx_desc; unsigned long mac_hi, mac_lo; @@ -318,16 +320,11 @@ static int davinci_emac_open(struct eth_device *edev) /* Start receive process */ writel(BD_TO_HW(priv->emac_rx_desc), priv->adap_emac + EMAC_RX0HDP); - ret = miidev_wait_aneg(&priv->miidev); + ret = phy_device_connect(edev, &priv->miibus, priv->phy_addr, NULL, + priv->phy_flags, priv->interface); if (ret) return ret; - ret = miidev_get_status(&priv->miidev); - if (ret < 0) - return ret; - - miidev_print_status(&priv->miidev); - dev_dbg(priv->dev, "- emac_open\n"); return 0; @@ -378,7 +375,7 @@ static void davinci_eth_ch_teardown(struct davinci_emac_priv *priv, int ch) static void davinci_emac_halt(struct eth_device *edev) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)edev->priv; + struct davinci_emac_priv *priv = edev->priv; dev_dbg(priv->dev, "+ emac_halt\n"); @@ -408,7 +405,7 @@ static void davinci_emac_halt(struct eth_device *edev) */ static int davinci_emac_send(struct eth_device *edev, void *packet, int length) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)edev->priv; + struct davinci_emac_priv *priv = edev->priv; uint64_t start; int ret_status; @@ -455,7 +452,7 @@ static int davinci_emac_send(struct eth_device *edev, void *packet, int length) */ static int davinci_emac_recv(struct eth_device *edev) { - struct davinci_emac_priv *priv = (struct davinci_emac_priv *)edev->priv; + struct davinci_emac_priv *priv = edev->priv; void __iomem *rx_curr_desc, *curr_desc, *tail_desc; unsigned char *pkt; int status, len, ret = -1; @@ -531,11 +528,19 @@ out: static int davinci_emac_probe(struct device_d *dev) { + struct davinci_emac_platform_data *pdata; struct davinci_emac_priv *priv; uint64_t start; + uint32_t phy_mask; dev_dbg(dev, "+ emac_probe\n"); + if (!dev->platform_data) { + dev_err(dev, "no platform_data\n"); + return -ENODEV; + } + pdata = dev->platform_data; + priv = xzalloc(sizeof(*priv)); dev->priv = priv; @@ -556,9 +561,6 @@ static int davinci_emac_probe(struct device_d *dev) /* Receive packet buffers */ priv->emac_rx_buffers = xmemalign(4096, EMAC_MAX_RX_BUFFERS * (EMAC_MAX_ETHERNET_PKT_SIZE + EMAC_PKT_ALIGN)); - /* PHY address for a discovered PHY (0xff - not found) */ - priv->active_phy_addr = 0xff; - priv->edev.priv = priv; priv->edev.init = davinci_emac_init; priv->edev.open = davinci_emac_open; @@ -573,22 +575,33 @@ static int davinci_emac_probe(struct device_d *dev) start = get_time_ns(); while (1) { - if (readl(priv->adap_mdio + EMAC_MDIO_ALIVE)) + phy_mask = readl(priv->adap_mdio + EMAC_MDIO_ALIVE); + if (phy_mask) { + dev_info(dev, "detected phy mask 0x%x\n", phy_mask); + phy_mask = ~phy_mask; break; + } if (is_timeout(start, 256 * MSECOND)) { - dev_err(dev, "No ETH PHY detected!\n"); + dev_err(dev, "no live phy, scanning all\n"); + phy_mask = 0; break; } } - priv->miidev.read = davinci_miidev_read; - priv->miidev.write = davinci_miidev_write; - priv->miidev.address = 0x01; - priv->miidev.flags = MIIDEV_FORCE_LINK; - priv->miidev.edev = &priv->edev; - priv->miidev.parent = dev; + if (pdata->interface_rmii) + priv->interface = PHY_INTERFACE_MODE_RMII; + else + priv->interface = PHY_INTERFACE_MODE_MII; + priv->phy_addr = pdata->phy_addr; + priv->phy_flags = pdata->force_link ? PHYLIB_FORCE_LINK : 0; + + priv->miibus.read = davinci_miibus_read; + priv->miibus.write = davinci_miibus_write; + priv->miibus.priv = priv; + priv->miibus.parent = dev; + priv->miibus.phy_mask = phy_mask; - mii_register(&priv->miidev); + mdiobus_register(&priv->miibus); eth_register(&priv->edev); -- cgit v1.2.3