mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-10 10:08:27 +02:00
0ae049b500
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15491 3c298f89-4303-0410-b956-a3cf2f4a3e73
119 lines
3.3 KiB
Diff
119 lines
3.3 KiB
Diff
--- a/drivers/net/arm/ixp4xx_eth.c
|
|
+++ b/drivers/net/arm/ixp4xx_eth.c
|
|
@@ -394,6 +394,53 @@ static void ixp4xx_adjust_link(struct ne
|
|
dev->name, port->speed, port->duplex ? "full" : "half");
|
|
}
|
|
|
|
+static int ixp4xx_phy_connect(struct net_device *dev)
|
|
+{
|
|
+ struct port *port = netdev_priv(dev);
|
|
+ struct eth_plat_info *plat = port->plat;
|
|
+ char phy_id[BUS_ID_SIZE];
|
|
+
|
|
+ snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy);
|
|
+ port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
|
|
+ PHY_INTERFACE_MODE_MII);
|
|
+ if (IS_ERR(port->phydev)) {
|
|
+ printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
|
|
+ return PTR_ERR(port->phydev);
|
|
+ }
|
|
+
|
|
+ /* mask with MAC supported features */
|
|
+ port->phydev->supported &= PHY_BASIC_FEATURES;
|
|
+ port->phydev->advertising = port->phydev->supported;
|
|
+
|
|
+ port->phydev->irq = PHY_POLL;
|
|
+
|
|
+ printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
|
|
+ npe_name(port->npe));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static void ixp4xx_phy_disconnect(struct net_device *dev)
|
|
+{
|
|
+ struct port *port = netdev_priv(dev);
|
|
+
|
|
+ phy_disconnect(port->phydev);
|
|
+}
|
|
+
|
|
+static void ixp4xx_phy_start(struct net_device *dev)
|
|
+{
|
|
+ struct port *port = netdev_priv(dev);
|
|
+
|
|
+ port->speed = 0; /* force "link up" message */
|
|
+ phy_start(port->phydev);
|
|
+}
|
|
+
|
|
+static void ixp4xx_phy_stop(struct net_device *dev)
|
|
+{
|
|
+ struct port *port = netdev_priv(dev);
|
|
+
|
|
+ phy_stop(port->phydev);
|
|
+}
|
|
|
|
static inline void debug_pkt(struct net_device *dev, const char *func,
|
|
u8 *data, int len)
|
|
@@ -1001,8 +1048,7 @@ static int eth_open(struct net_device *d
|
|
return err;
|
|
}
|
|
|
|
- port->speed = 0; /* force "link up" message */
|
|
- phy_start(port->phydev);
|
|
+ ixp4xx_phy_start(dev);
|
|
|
|
for (i = 0; i < ETH_ALEN; i++)
|
|
__raw_writel(dev->dev_addr[i], &port->regs->hw_addr[i]);
|
|
@@ -1123,7 +1169,7 @@ static int eth_close(struct net_device *
|
|
printk(KERN_CRIT "%s: unable to disable loopback\n",
|
|
dev->name);
|
|
|
|
- phy_stop(port->phydev);
|
|
+ ixp4xx_phy_stop(dev);
|
|
|
|
if (!ports_open)
|
|
qmgr_disable_irq(TXDONE_QUEUE);
|
|
@@ -1147,7 +1193,6 @@ static int __devinit eth_init_one(struct
|
|
struct net_device *dev;
|
|
struct eth_plat_info *plat = pdev->dev.platform_data;
|
|
u32 regs_phys;
|
|
- char phy_id[BUS_ID_SIZE];
|
|
int err;
|
|
|
|
if (!(dev = alloc_etherdev(sizeof(struct port))))
|
|
@@ -1210,22 +1255,9 @@ static int __devinit eth_init_one(struct
|
|
__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
|
|
udelay(50);
|
|
|
|
- snprintf(phy_id, BUS_ID_SIZE, PHY_ID_FMT, "0", plat->phy);
|
|
- port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
|
|
- PHY_INTERFACE_MODE_MII);
|
|
- if (IS_ERR(port->phydev)) {
|
|
- printk(KERN_ERR "%s: Could not attach to PHY\n", dev->name);
|
|
- return PTR_ERR(port->phydev);
|
|
- }
|
|
-
|
|
- /* mask with MAC supported features */
|
|
- port->phydev->supported &= PHY_BASIC_FEATURES;
|
|
- port->phydev->advertising = port->phydev->supported;
|
|
-
|
|
- port->phydev->irq = PHY_POLL;
|
|
-
|
|
- printk(KERN_INFO "%s: MII PHY %i on %s\n", dev->name, plat->phy,
|
|
- npe_name(port->npe));
|
|
+ err = ixp4xx_phy_connect(dev);
|
|
+ if (err)
|
|
+ goto err_unreg;
|
|
|
|
return 0;
|
|
|
|
@@ -1243,7 +1275,7 @@ static int __devexit eth_remove_one(stru
|
|
struct net_device *dev = platform_get_drvdata(pdev);
|
|
struct port *port = netdev_priv(dev);
|
|
|
|
- phy_disconnect(port->phydev);
|
|
+ ixp4xx_phy_disconnect(dev);
|
|
unregister_netdev(dev);
|
|
npe_port_tab[NPE_ID(port->id)] = NULL;
|
|
platform_set_drvdata(pdev, NULL);
|