X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/52696b5d81d91be3b567e67bbc60ecfe125a4716..92c4109e54db53cd8942e95309f909a9891077ec:/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c

diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
index b1838d578..512b42eb5 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
@@ -87,7 +87,8 @@ static void ag71xx_phy_link_update(struct ag71xx *ag)
 
 	if (!ag->link) {
 		netif_carrier_off(ag->dev);
-		printk(KERN_INFO "%s: link down\n", ag->dev->name);
+		if (netif_msg_link(ag))
+			printk(KERN_INFO "%s: link down\n", ag->dev->name);
 		return;
 	}
 
@@ -133,10 +134,11 @@ static void ag71xx_phy_link_update(struct ag71xx *ag)
 	ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);
 
 	netif_carrier_on(ag->dev);
-	printk(KERN_INFO "%s: link up (%sMbps/%s duplex)\n",
-		ag->dev->name,
-		ag71xx_speed_str(ag),
-		(DUPLEX_FULL == ag->duplex) ? "Full" : "Half");
+	if (netif_msg_link(ag))
+		printk(KERN_INFO "%s: link up (%sMbps/%s duplex)\n",
+			ag->dev->name,
+			ag71xx_speed_str(ag),
+			(DUPLEX_FULL == ag->duplex) ? "Full" : "Half");
 
 	DBG("%s: fifo1=%#x, fifo2=%#x, fifo3=%#x, fifo4=%#x, fifo5=%#x\n",
 		ag->dev->name,
@@ -191,8 +193,10 @@ void ag71xx_phy_start(struct ag71xx *ag)
 	if (ag->phy_dev) {
 		phy_start(ag->phy_dev);
 	} else {
-		ag->duplex = DUPLEX_FULL;
-		ag->speed = SPEED_100;
+		struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+
+		ag->duplex = pdata->duplex;
+		ag->speed = pdata->speed;
 		ag->link = 1;
 		ag71xx_phy_link_update(ag);
 	}
@@ -218,8 +222,8 @@ int ag71xx_phy_connect(struct ag71xx *ag)
 	int phy_count = 0;
 	int phy_addr;
 
-	if (ag->mii_bus) {
-		/* TODO: use mutex of the mdio bus */
+	if (ag->mii_bus && pdata->phy_mask) {
+		/* TODO: use mutex of the mdio bus? */
 		for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
 			if (!(pdata->phy_mask & (1 << phy_addr)))
 				continue;
@@ -240,9 +244,6 @@ int ag71xx_phy_connect(struct ag71xx *ag)
 	}
 
 	switch (phy_count) {
-	case 0:
-		printk(KERN_ERR "%s: no PHY found\n", dev->name);
-		return -ENODEV;
 	case 1:
 		ag->phy_dev = phy_connect(dev, phydev->dev.bus_id,
 			&ag71xx_phy_link_adjust, 0, pdata->phy_if_mode);
@@ -273,9 +274,10 @@ int ag71xx_phy_connect(struct ag71xx *ag)
 		ag->speed = 0;
 		ag->duplex = -1;
 		break;
+
 	default:
 		ag->phy_dev = NULL;
-		printk(KERN_DEBUG "%s: connected to multiple PHYs (%d)\n",
+		printk(KERN_DEBUG "%s: connected to %d PHYs\n",
 			dev->name, phy_count);
 		break;
 	}