Quellcode durchsuchen

setup speed/duplex on RB-433/450 (closes #4151)

SVN-Revision: 13087
Gabor Juhos vor 17 Jahren
Ursprung
Commit
e0fc95a2ab

+ 4 - 0
target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb-4xx.c

@@ -183,6 +183,8 @@ static void __init rb433_setup(void)
 
 
 	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
 	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
 	ar71xx_eth0_data.phy_mask = 0x00000003;
 	ar71xx_eth0_data.phy_mask = 0x00000003;
+	ar71xx_eth0_data.speed = SPEED_100;
+	ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
 
 	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
 	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
 	ar71xx_eth1_data.phy_mask = 0x00000010;
 	ar71xx_eth1_data.phy_mask = 0x00000010;
@@ -212,6 +214,8 @@ static void __init rb450_setup(void)
 
 
 	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
 	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
 	ar71xx_eth0_data.phy_mask = 0x0000000f;
 	ar71xx_eth0_data.phy_mask = 0x0000000f;
+	ar71xx_eth0_data.speed = SPEED_100;
+	ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
 
 	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
 	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
 	ar71xx_eth1_data.phy_mask = 0x00000010;
 	ar71xx_eth1_data.phy_mask = 0x00000010;

+ 1 - 1
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h

@@ -37,7 +37,7 @@
 #define ETH_FCS_LEN	4
 #define ETH_FCS_LEN	4
 
 
 #define AG71XX_DRV_NAME		"ag71xx"
 #define AG71XX_DRV_NAME		"ag71xx"
-#define AG71XX_DRV_VERSION	"0.4.2"
+#define AG71XX_DRV_VERSION	"0.4.3"
 
 
 #define AG71XX_NAPI_TX		1
 #define AG71XX_NAPI_TX		1
 
 

+ 11 - 0
target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_phy.c

@@ -276,6 +276,17 @@ int ag71xx_phy_connect(struct ag71xx *ag)
 		break;
 		break;
 
 
 	default:
 	default:
+		switch (pdata->speed) {
+		case SPEED_10:
+		case SPEED_100:
+		case SPEED_1000:
+			break;
+		default:
+			printk(KERN_ERR "%s: invalid speed specified\n",
+				dev->name);
+			return -EINVAL;
+		}
+
 		ag->phy_dev = NULL;
 		ag->phy_dev = NULL;
 		printk(KERN_DEBUG "%s: connected to %d PHYs\n",
 		printk(KERN_DEBUG "%s: connected to %d PHYs\n",
 			dev->name, phy_count);
 			dev->name, phy_count);