brcm63xx: move MAGIC to dts

[15.05/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 072419d..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
-@@ -792,6 +792,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,
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
-       },
-@@ -836,6 +838,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,
        },
-@@ -1126,6 +1130,8 @@ static struct board_info __initdata boar
+@@ -607,6 +611,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -27,7 +20,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1200,6 +1206,8 @@ static struct board_info __initdata boar
+@@ -640,6 +646,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -36,7 +29,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1480,6 +1488,8 @@ static struct board_info __initdata boar
+@@ -787,6 +795,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -45,7 +38,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1659,6 +1669,8 @@ static struct board_info __initdata boar
+@@ -849,6 +859,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -54,7 +47,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1735,6 +1747,8 @@ static struct board_info __initdata boar
+@@ -890,6 +902,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -63,7 +56,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1758,6 +1772,8 @@ static struct board_info __initdata boar
+@@ -912,6 +926,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -72,7 +65,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1779,6 +1795,8 @@ static struct board_info __initdata boar
+@@ -932,6 +948,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -81,7 +74,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2117,6 +2135,8 @@ static struct board_info __initdata boar
+@@ -1115,6 +1133,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -90,28 +83,14 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -2171,6 +2191,8 @@ static struct board_info __initdata boar
+@@ -1186,6 +1206,12 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
-       },
-@@ -2313,6 +2335,8 @@ static struct board_info __initdata boar
-       },
- 
-       .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
-               .force_speed_100        = 1,
-               .force_duplex_full      = 1,
-       },
-@@ -2432,6 +2456,8 @@ static struct board_info __initdata boar
-       },
- 
-       .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
                .force_speed_100        = 1,