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 6442761..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
@@ -11,7 +11,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -627,6 +631,8 @@ static struct board_info __initdata boar
+@@ -607,6 +611,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -20,7 +20,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -660,6 +666,8 @@ static struct board_info __initdata boar
+@@ -640,6 +646,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -29,7 +29,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -807,6 +815,8 @@ static struct board_info __initdata boar
+@@ -787,6 +795,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -38,7 +38,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -869,6 +879,8 @@ static struct board_info __initdata boar
+@@ -849,6 +859,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -47,7 +47,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -910,6 +922,8 @@ static struct board_info __initdata boar
+@@ -890,6 +902,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -56,7 +56,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -932,6 +946,8 @@ static struct board_info __initdata boar
+@@ -912,6 +926,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -65,7 +65,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -952,6 +968,8 @@ static struct board_info __initdata boar
+@@ -932,6 +948,8 @@ static struct board_info __initdata boar
                .use_internal_phy       = 1,
        },
        .enet1 = {
@@ -74,7 +74,7 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1147,6 +1165,8 @@ static struct board_info __initdata boar
+@@ -1115,6 +1133,8 @@ static struct board_info __initdata boar
        },
  
        .enet1 = {
@@ -83,19 +83,12 @@
                .force_speed_100        = 1,
                .force_duplex_full      = 1,
        },
-@@ -1219,6 +1239,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,
-       },
-@@ -1244,6 +1266,10 @@ static struct board_info __initdata boar
-       },
- 
-       .enet1 = {
 +              .has_phy                = 1,
 +              .phy_id                 = 0,
 +              .has_phy                = 1,