domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

brcm63xx: fix up borked patch

Browse Source 
Fix up patch borked by quilt fuzzy application of patches.

SVN-Revision: 41294
This commit is contained in:
Jonas Gorski
2014-06-21 19:23:18 +00:00
parent e1de4e27c1
commit f695fa358a
2 changed files with 30 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
target/linux/brcm63xx/patches-3.10/553-boards_probe_switch.patch
View File

@@ -54,14 +54,28 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1621,6 +1633,12 @@ static struct board_info __initdata boar @@ -1621,6 +1633,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1, .use_internal_phy = 1,
}, },
.enet1 = { .enet1 = {
+ .has_phy = 1, + .has_phy = 1,
+ .phy_id = 0, + .phy_id = 0,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1642,6 +1656,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
+ .has_phy = 1, + .has_phy = 1,
+ .phy_id = 0, + .phy_id = 0,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1661,6 +1677,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
+ .has_phy = 1, + .has_phy = 1,
+ .phy_id = 0, + .phy_id = 0,
.force_speed_100 = 1, .force_speed_100 = 1,

16
target/linux/brcm63xx/patches-3.14/553-boards_probe_switch.patch
View File

@@ -54,14 +54,28 @@
.force_speed_100 = 1, .force_speed_100 = 1,
.force_duplex_full = 1, .force_duplex_full = 1,
}, },
@@ -1623,6 +1635,12 @@ static struct board_info __initdata boar @@ -1623,6 +1635,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1, .use_internal_phy = 1,
}, },
.enet1 = { .enet1 = {
+ .has_phy = 1, + .has_phy = 1,
+ .phy_id = 0, + .phy_id = 0,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1644,6 +1658,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
+ .has_phy = 1, + .has_phy = 1,
+ .phy_id = 0, + .phy_id = 0,
.force_speed_100 = 1,
.force_duplex_full = 1,
},
@@ -1663,6 +1679,8 @@ static struct board_info __initdata boar
.use_internal_phy = 1,
},
.enet1 = {
+ .has_phy = 1, + .has_phy = 1,
+ .phy_id = 0, + .phy_id = 0,
.force_speed_100 = 1, .force_speed_100 = 1,