aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
blob: 0e72267ab5bbd2c75ad2bbb2d3bb4dfd5203f354 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -33,7 +33,6 @@
 #include <linux/string.h>
 #include <linux/etherdevice.h>
 #include <linux/phy.h>
-#include <linux/phy_fixed.h>
 
 #include <asm/addrspace.h>
 #include <asm/mach-ar7/ar7.h>
@@ -294,12 +293,6 @@ static struct physmap_flash_data physmap
 	.width = 2,
 };
 
-static struct fixed_phy_status fixed_phy_status __initdata = {
-	.link = 1,
-	.speed = 100,
-	.duplex = 1,
-};
-
 static struct plat_cpmac_data cpmac_low_data = {
 	.reset_bit = 17,
 	.power_bit = 20,
@@ -716,11 +709,6 @@ static int __init ar7_register_devices(v
 	}
 
 	if (ar7_has_high_cpmac()) {
-		res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
-						&fixed_phy_status);
-		if (res && res != -ENODEV)
-			return res;
-
 		cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
 						cpmac_high_data.dev_addr);
 		res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
@@ -736,11 +724,6 @@ static int __init ar7_register_devices(v
 
 	}
 
-	res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id :
-			cpmac_low.id, &fixed_phy_status);
-	if (res && res != -ENODEV)
-		return res;
-
 	cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
 			cpmac_low_data.dev_addr);
 	res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct
 
 	pdata = pdev->dev.platform_data;
 
-	if (external_switch || dumb_switch) {
-		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
-		phy_id = pdev->id;
-	} else {
-		for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
-			if (!(pdata->phy_mask & (1 << phy_id)))
-				continue;
-			if (!cpmac_mii->phy_map[phy_id])
-				continue;
-			strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
-			break;
-		}
+	for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
+		if (!(pdata->phy_mask & (1 << phy_id)))
+			continue;
+		if (!cpmac_mii->phy_map[phy_id])
+			continue;
+		strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
+		break;
 	}
-
+	
 	if (phy_id == PHY_MAX_ADDR) {
+		//This probably wont work as no fixed bus anymore.
 		dev_err(&pdev->dev, "no PHY present, falling back to switch mode\n");
 		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
 		phy_id = pdev->id;
@@ -1269,7 +1265,7 @@ int __devinit cpmac_init(void)
 	}
 
 	cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
-		~(mask | 0x80000000);
+		~(mask | 0x80000001);
 	snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
 
 	res = mdiobus_register(cpmac_mii);