projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm63xx: move MAGIC to dts
[openwrt.git]
/
target
/
linux
/
brcm63xx
/
patches-3.14
/
553-boards_probe_switch.patch
diff --git
a/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
b/target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
index
454c795
..
03cda5c
100644
(file)
--- a/
target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
+++ b/
target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
@@
-1,24
+1,17
@@
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
-@@ -
796,6 +796,8
@@ static struct board_info __initdata boar
+@@ -
423,6 +423,10
@@ static struct board_info __initdata boar
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
+ .has_phy = 1,
+ .phy_id = 0,
.has_uart0 = 1,
.has_enet0 = 1,
.enet0 = {
+ .has_phy = 1,
+ .phy_id = 0,
- .force_speed_100 = 1,
- .force_duplex_full = 1,
- },
-@@ -840,6 +842,8 @@ static struct board_info __initdata boar
- .has_uart0 = 1,
- .has_enet0 = 1,
- .enet0 = {
+ .has_phy = 1,
+ .phy_id = 0,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
+ .has_phy = 1,
+ .phy_id = 0,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
1130,6 +1134
,8 @@ static struct board_info __initdata boar
+@@ -
607,6 +611
,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.use_internal_phy = 1,
},
.enet1 = {
@@
-27,7
+20,7
@@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
1204,6 +1210
,8 @@ static struct board_info __initdata boar
+@@ -
640,6 +646
,8 @@ static struct board_info __initdata boar
},
.enet1 = {
},
.enet1 = {
@@
-36,7
+29,7
@@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
1484,6 +1492
,8 @@ static struct board_info __initdata boar
+@@ -
787,6 +795
,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.use_internal_phy = 1,
},
.enet1 = {
@@
-45,7
+38,7
@@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
1663,6 +1673
,8 @@ static struct board_info __initdata boar
+@@ -
849,6 +859
,8 @@ static struct board_info __initdata boar
},
.enet1 = {
},
.enet1 = {
@@
-54,7
+47,7
@@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
1739,6 +1751
,8 @@ static struct board_info __initdata boar
+@@ -
890,6 +902
,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.use_internal_phy = 1,
},
.enet1 = {
@@
-63,7
+56,7
@@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
1762,6 +177
6,8 @@ static struct board_info __initdata boar
+@@ -
912,6 +92
6,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.use_internal_phy = 1,
},
.enet1 = {
@@
-72,7
+65,7
@@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
1783,6 +1799
,8 @@ static struct board_info __initdata boar
+@@ -
932,6 +948
,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
.use_internal_phy = 1,
},
.enet1 = {
@@
-81,7
+74,7
@@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
2121,6 +2139
,8 @@ static struct board_info __initdata boar
+@@ -
1115,6 +1133
,8 @@ static struct board_info __initdata boar
},
.enet1 = {
},
.enet1 = {
@@
-90,28
+83,14
@@
.force_speed_100 = 1,
.force_duplex_full = 1,
},
.force_speed_100 = 1,
.force_duplex_full = 1,
},
-@@ -
2175,6 +2195,8
@@ static struct board_info __initdata boar
+@@ -
1186,6 +1206,12
@@ static struct board_info __initdata boar
},
.enet1 = {
+ .has_phy = 1,
+ .phy_id = 0,
},
.enet1 = {
+ .has_phy = 1,
+ .phy_id = 0,
- .force_speed_100 = 1,
- .force_duplex_full = 1,
- },
-@@ -2317,6 +2339,8 @@ static struct board_info __initdata boar
- },
-
- .enet1 = {
+ .has_phy = 1,
+ .phy_id = 0,
+ .has_phy = 1,
+ .phy_id = 0,
- .force_speed_100 = 1,
- .force_duplex_full = 1,
- },
-@@ -2436,6 +2460,8 @@ static struct board_info __initdata boar
- },
-
- .enet1 = {
+ .has_phy = 1,
+ .phy_id = 0,
.force_speed_100 = 1,
+ .has_phy = 1,
+ .phy_id = 0,
.force_speed_100 = 1,