1 TODO: take care of additional PHYs through the PHY abstraction layer
3 --- a/arch/arm/mach-ixp4xx/include/mach/platform.h
4 +++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
5 @@ -95,12 +95,23 @@ struct ixp4xx_pata_data {
6 #define IXP4XX_ETH_NPEB 0x10
7 #define IXP4XX_ETH_NPEC 0x20
9 +#define IXP4XX_ETH_PHY_MAX_ADDR 32
11 /* Information about built-in Ethernet MAC interfaces */
12 struct eth_plat_info {
13 u8 phy; /* MII PHY ID, 0 - 31 */
14 u8 rxq; /* configurable, currently 0 - 31 only */
28 /* Information about built-in HSS (synchronous serial) interfaces */
29 --- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
30 +++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
31 @@ -605,6 +605,37 @@ static int ixp4xx_phy_connect(struct net
32 struct eth_plat_info *plat = port->plat;
33 char phy_id[MII_BUS_ID_SIZE + 3];
35 + if (plat->phy == IXP4XX_ETH_PHY_MAX_ADDR) {
37 + switch (plat->speed) {
42 + printk(KERN_ERR "%s: invalid speed (%d)\n",
43 + dev->name, plat->speed);
47 + switch (plat->duplex) {
52 + printk(KERN_ERR "%s: invalid duplex mode (%d)\n",
53 + dev->name, plat->duplex);
56 + port->speed = plat->speed;
57 + port->duplex = plat->duplex;
59 + port->speed = plat->speed_10 ? SPEED_10 : SPEED_100;
60 + port->duplex = plat->half_duplex ? DUPLEX_HALF : DUPLEX_FULL;
66 snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
67 mdio_bus->id, plat->phy);
68 port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link,
69 @@ -627,21 +658,32 @@ static void ixp4xx_phy_disconnect(struct
71 struct port *port = netdev_priv(dev);
73 - phy_disconnect(port->phydev);
75 + phy_disconnect(port->phydev);
78 static void ixp4xx_phy_start(struct net_device *dev)
80 struct port *port = netdev_priv(dev);
82 - phy_start(port->phydev);
84 + phy_start(port->phydev);
87 + ixp4xx_update_link(dev);
91 static void ixp4xx_phy_stop(struct net_device *dev)
93 struct port *port = netdev_priv(dev);
95 - phy_stop(port->phydev);
97 + phy_stop(port->phydev);
100 + ixp4xx_update_link(dev);
104 static inline void debug_pkt(struct net_device *dev, const char *func,
105 @@ -1030,6 +1072,8 @@ static void eth_set_mcast_list(struct ne
107 static int eth_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
109 + struct port *port = netdev_priv(dev);
111 if (!netif_running(dev))
114 @@ -1040,6 +1084,9 @@ static int eth_ioctl(struct net_device *
115 return hwtstamp_get(dev, req);
119 + return -EOPNOTSUPP;
121 return phy_mii_ioctl(dev->phydev, req, cmd);
124 @@ -1059,6 +1106,11 @@ static void ixp4xx_get_drvinfo(struct ne
126 static int ixp4xx_nway_reset(struct net_device *dev)
128 + struct port *port = netdev_priv(dev);
131 + return -EOPNOTSUPP;
133 return phy_start_aneg(dev->phydev);
136 @@ -1519,7 +1571,7 @@ static int eth_init_one(struct platform_
140 - ixp4xx_phy_disconnect(phydev);
141 + ixp4xx_phy_disconnect(port->netdev);
143 npe_port_tab[NPE_ID(port->id)] = NULL;
144 release_resource(port->mem_res);
145 @@ -1537,7 +1589,7 @@ static int eth_remove_one(struct platfor
146 struct port *port = netdev_priv(dev);
148 unregister_netdev(dev);
149 - ixp4xx_phy_disconnect(phydev);
150 + ixp4xx_phy_disconnect(port->netdev);
151 npe_port_tab[NPE_ID(port->id)] = NULL;
152 npe_release(port->npe);
153 release_resource(port->mem_res);