From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001
From: James <>
Date: Wed, 4 Nov 2015 11:49:21 +0000
Subject: trunk-47381

---
 .../205-npe_driver_separate_phy_functions.patch    | 131 +++++++++++++++++++++
 1 file changed, 131 insertions(+)
 create mode 100644 target/linux/ixp4xx/patches-3.18/205-npe_driver_separate_phy_functions.patch

(limited to 'target/linux/ixp4xx/patches-3.18/205-npe_driver_separate_phy_functions.patch')

diff --git a/target/linux/ixp4xx/patches-3.18/205-npe_driver_separate_phy_functions.patch b/target/linux/ixp4xx/patches-3.18/205-npe_driver_separate_phy_functions.patch
new file mode 100644
index 0000000..6d1eb7b
--- /dev/null
+++ b/target/linux/ixp4xx/patches-3.18/205-npe_driver_separate_phy_functions.patch
@@ -0,0 +1,131 @@
+From e3eab80fb5d0a7d7fdb0f2f231b27161d5ec3804 Mon Sep 17 00:00:00 2001
+From: Jonas Gorski <jogo@openwrt.org>
+Date: Sun, 30 Jun 2013 15:52:53 +0200
+Subject: [PATCH 23/36] 205-npe_driver_separate_phy_functions.patch
+
+---
+ drivers/net/ethernet/xscale/ixp4xx_eth.c |   70 ++++++++++++++++++++++--------
+ 1 file changed, 51 insertions(+), 19 deletions(-)
+
+--- a/drivers/net/ethernet/xscale/ixp4xx_eth.c
++++ b/drivers/net/ethernet/xscale/ixp4xx_eth.c
+@@ -589,6 +589,51 @@ 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,
++		mdio_bus->id, plat->phy);
++	port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link,
++				   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)
+@@ -1259,8 +1304,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]);
+@@ -1381,7 +1425,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);
+@@ -1407,7 +1451,6 @@ static int eth_init_one(struct platform_
+ 	struct net_device *dev;
+ 	struct eth_plat_info *plat = dev_get_platdata(&pdev->dev);
+ 	u32 regs_phys;
+-	char phy_id[MII_BUS_ID_SIZE + 3];
+ 	int err;
+ 
+ 	if (!(dev = alloc_etherdev(sizeof(struct port))))
+@@ -1465,20 +1508,9 @@ static int eth_init_one(struct platform_
+ 	__raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
+ 	udelay(50);
+ 
+-	snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT,
+-		mdio_bus->id, plat->phy);
+-	port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link,
+-				   PHY_INTERFACE_MODE_MII);
+-	if (IS_ERR(port->phydev)) {
+-		err = PTR_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;
+@@ -1489,7 +1521,7 @@ static int eth_init_one(struct platform_
+ 	return 0;
+ 
+ err_phy_dis:
+-	phy_disconnect(port->phydev);
++	ixp4xx_phy_disconnect(dev);
+ err_free_mem:
+ 	npe_port_tab[NPE_ID(port->id)] = NULL;
+ 	release_resource(port->mem_res);
+@@ -1506,7 +1538,7 @@ static int eth_remove_one(struct platfor
+ 	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;
+ 	npe_release(port->npe);
+ 	release_resource(port->mem_res);
-- 
cgit v1.2.3