mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
[MIPS] BCM47XX: Use new SSB SPROM data structure
Switch the BCM47XX code to the new SPROM data structure now that the old one has been removed. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
parent
0788150e63
commit
cc2d6f701b
|
@ -92,17 +92,17 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus,
|
||||||
iv->sprom.revision = 3;
|
iv->sprom.revision = 3;
|
||||||
|
|
||||||
if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
|
if (cfe_getenv("et0macaddr", buf, sizeof(buf)) >= 0)
|
||||||
str2eaddr(buf, iv->sprom.r1.et0mac);
|
str2eaddr(buf, iv->sprom.et0mac);
|
||||||
if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
|
if (cfe_getenv("et1macaddr", buf, sizeof(buf)) >= 0)
|
||||||
str2eaddr(buf, iv->sprom.r1.et1mac);
|
str2eaddr(buf, iv->sprom.et1mac);
|
||||||
if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
|
if (cfe_getenv("et0phyaddr", buf, sizeof(buf)) >= 0)
|
||||||
iv->sprom.r1.et0phyaddr = simple_strtoul(buf, NULL, 10);
|
iv->sprom.et0phyaddr = simple_strtoul(buf, NULL, 10);
|
||||||
if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
|
if (cfe_getenv("et1phyaddr", buf, sizeof(buf)) >= 0)
|
||||||
iv->sprom.r1.et1phyaddr = simple_strtoul(buf, NULL, 10);
|
iv->sprom.et1phyaddr = simple_strtoul(buf, NULL, 10);
|
||||||
if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
|
if (cfe_getenv("et0mdcport", buf, sizeof(buf)) >= 0)
|
||||||
iv->sprom.r1.et0mdcport = simple_strtoul(buf, NULL, 10);
|
iv->sprom.et0mdcport = simple_strtoul(buf, NULL, 10);
|
||||||
if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
|
if (cfe_getenv("et1mdcport", buf, sizeof(buf)) >= 0)
|
||||||
iv->sprom.r1.et1mdcport = simple_strtoul(buf, NULL, 10);
|
iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,7 +106,7 @@ static int __init wgt634u_init(void)
|
||||||
* been allocated ranges 00:09:5b:xx:xx:xx and 00:0f:b5:xx:xx:xx.
|
* been allocated ranges 00:09:5b:xx:xx:xx and 00:0f:b5:xx:xx:xx.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
u8 *et0mac = ssb_bcm47xx.sprom.r1.et0mac;
|
u8 *et0mac = ssb_bcm47xx.sprom.et0mac;
|
||||||
|
|
||||||
if (et0mac[0] == 0x00 &&
|
if (et0mac[0] == 0x00 &&
|
||||||
((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
|
((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
|
||||||
|
|
Loading…
Reference in a new issue