X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e6e930942664682d11abe4ad7ccd0bada1afecfa..3095cc80909037f4344bfc12275a028da6383cf6:/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 9c76544af..9b88b3d41 100644
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c
@@ -44,8 +44,12 @@ static void ag71xx_phy_link_adjust(struct net_device *dev)
 
 void ag71xx_phy_start(struct ag71xx *ag)
 {
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+
 	if (ag->phy_dev) {
 		phy_start(ag->phy_dev);
+	} else if (pdata->has_ar7240_switch) {
+		ag71xx_ar7240_start(ag);
 	} else {
 		ag->link = 1;
 		ag71xx_link_adjust(ag);
@@ -54,12 +58,20 @@ void ag71xx_phy_start(struct ag71xx *ag)
 
 void ag71xx_phy_stop(struct ag71xx *ag)
 {
-	if (ag->phy_dev) {
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+	unsigned long flags;
+
+	if (ag->phy_dev)
 		phy_stop(ag->phy_dev);
-	} else {
+	else if (pdata->has_ar7240_switch)
+			ag71xx_ar7240_stop(ag);
+
+	spin_lock_irqsave(&ag->lock, flags);
+	if (ag->link) {
 		ag->link = 0;
 		ag71xx_link_adjust(ag);
 	}
+	spin_unlock_irqrestore(&ag->lock, flags);
 }
 
 static int ag71xx_phy_connect_fixed(struct ag71xx *ag)
@@ -182,10 +194,14 @@ static struct mii_bus *dev_to_mii_bus(struct device *dev)
 	return NULL;
 }
 
-int ag71xx_phy_connect(struct ag71xx *ag)
+int __devinit ag71xx_phy_connect(struct ag71xx *ag)
 {
 	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
+	if (pdata->mii_bus_dev == NULL ||
+	    pdata->mii_bus_dev->bus == NULL )
+		return ag71xx_phy_connect_fixed(ag);
+
 	ag->mii_bus = dev_to_mii_bus(pdata->mii_bus_dev);
 	if (ag->mii_bus == NULL) {
 		printk(KERN_ERR "%s: unable to find MII bus on device '%s'\n",
@@ -200,6 +216,9 @@ int ag71xx_phy_connect(struct ag71xx *ag)
 		mutex_unlock(&ag->mii_bus->mdio_lock);
 	}
 
+	if (pdata->has_ar7240_switch)
+		return ag71xx_ar7240_init(ag);
+
 	if (pdata->phy_mask)
 		return ag71xx_phy_connect_multi(ag);
 
@@ -208,6 +227,10 @@ int ag71xx_phy_connect(struct ag71xx *ag)
 
 void ag71xx_phy_disconnect(struct ag71xx *ag)
 {
-	if (ag->phy_dev)
+	struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+
+	if (pdata->has_ar7240_switch)
+		ag71xx_ar7240_cleanup(ag);
+	else if (ag->phy_dev)
 		phy_disconnect(ag->phy_dev);
 }