ixp4xx: add kernel 2.6.35 preliminary support

[openwrt.git] / target / linux / ixp4xx / patches-2.6.35 / 205-npe_driver_separate_phy_functions.patch

diff --git a/target/linux/ixp4xx/patches-2.6.35/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-2.6.35/205-npe_driver_separate_phy_functions.patch
new file mode 100644 (file)
index 0000000..b9835a0
--- /dev/null
+++ b/target/linux/ixp4xx/patches-2.6.35/205-npe_driver_separate_phy_functions.patch
@@ -0,0 +1,119 @@
+--- a/drivers/net/arm/ixp4xx_eth.c
++++ b/drivers/net/arm/ixp4xx_eth.c
+@@ -396,6 +396,50 @@ 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[MII_BUS_ID_SIZE + 3];
++
++      snprintf(phy_id, MII_BUS_ID_SIZE + 3, 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;
++
++      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)
+@@ -1005,8 +1049,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]);
+@@ -1127,7 +1170,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);
+@@ -1153,7 +1196,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[MII_BUS_ID_SIZE + 3];
+       int err;
+ 
+       if (!(dev = alloc_etherdev(sizeof(struct port))))
+@@ -1211,18 +1253,10 @@ static int __devinit eth_init_one(struct
+       __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
+       udelay(50);
+ 
+-      snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
+-      port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
+-                                 PHY_INTERFACE_MODE_MII);
+-      if ((err = IS_ERR(port->phydev)))
++      err = ixp4xx_phy_connect(dev);
++      if (err)
+               goto err_free_mem;
+ 
+-      /* mask with MAC supported features */
+-      port->phydev->supported &= PHY_BASIC_FEATURES;
+-      port->phydev->advertising = port->phydev->supported;
+-
+-      port->phydev->irq = PHY_POLL;
+-
+       if ((err = register_netdev(dev)))
+               goto err_phy_dis;
+ 
+@@ -1232,7 +1266,7 @@ static int __devinit eth_init_one(struct
+       return 0;
+ 
+ err_phy_dis:
+-      phy_disconnect(port->phydev);
++      ixp4xx_phy_disconnect(port->phydev);
+ err_free_mem:
+       npe_port_tab[NPE_ID(port->id)] = NULL;
+       platform_set_drvdata(pdev, NULL);
+@@ -1250,7 +1284,7 @@ static int __devexit eth_remove_one(stru
+       struct port *port = netdev_priv(dev);
+ 
+       unregister_netdev(dev);
+-      phy_disconnect(port->phydev);
++      ixp4xx_phy_disconnect(dev);
+       npe_port_tab[NPE_ID(port->id)] = NULL;
+       platform_set_drvdata(pdev, NULL);
+       npe_release(port->npe);