Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e122ac0 authored by Rafał Miłecki's avatar Rafał Miłecki Committed by Ralf Baechle
Browse files

MIPS: BCM47xx: Extract info about et2 interface 



New devices may have more than 1 Ethernet core (device). We should
extract info about them to make it available to Ethernet drivers.

Signed-off-by: default avatarRafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@linux-mips.org
Cc: Hauke Mehrtens <hauke@hauke-m.de>
Cc: Hante Meuleman <meuleman@broadcom.com>
Cc: Ian Kent <raven@themaw.net>
Patchwork: https://patchwork.linux-mips.org/patch/10027/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 1387fe7d

arch/mips/bcm47xx/sprom.c

+6 −0
Original line number Diff line number Diff line
@@ -531,6 +531,8 @@ static int mac_addr_used = 2; 
static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom,

					const char *prefix, bool fallback)

{

	bool fb = fallback;



	nvram_read_macaddr(prefix, "et0macaddr", sprom->et0mac, fallback);

	nvram_read_u8(prefix, NULL, "et0mdcport", &sprom->et0mdcport, 0,

		      fallback);
@@ -543,6 +545,10 @@ static void bcm47xx_fill_sprom_ethernet(struct ssb_sprom *sprom, 
	nvram_read_u8(prefix, NULL, "et1phyaddr", &sprom->et1phyaddr, 0,

		      fallback);



	nvram_read_macaddr(prefix, "et2macaddr", sprom->et2mac, fb);

	nvram_read_u8(prefix, NULL, "et2mdcport", &sprom->et2mdcport, 0, fb);

	nvram_read_u8(prefix, NULL, "et2phyaddr", &sprom->et2phyaddr, 0, fb);



	nvram_read_macaddr(prefix, "macaddr", sprom->il0mac, fallback);

	nvram_read_macaddr(prefix, "il0macaddr", sprom->il0mac, fallback);

include/linux/ssb/ssb.h

+3 −0
Original line number Diff line number Diff line
@@ -29,10 +29,13 @@ struct ssb_sprom { 
	u8 il0mac[6] __aligned(sizeof(u16));	/* MAC address for 802.11b/g */

	u8 et0mac[6] __aligned(sizeof(u16));	/* MAC address for Ethernet */

	u8 et1mac[6] __aligned(sizeof(u16));	/* MAC address for 802.11a */

	u8 et2mac[6] __aligned(sizeof(u16));	/* MAC address for extra Ethernet */

	u8 et0phyaddr;		/* MII address for enet0 */

	u8 et1phyaddr;		/* MII address for enet1 */

	u8 et2phyaddr;		/* MII address for enet2 */

	u8 et0mdcport;		/* MDIO for enet0 */

	u8 et1mdcport;		/* MDIO for enet1 */

	u8 et2mdcport;		/* MDIO for enet2 */

	u16 dev_id;		/* Device ID overriding e.g. PCI ID */

	u16 board_rev;		/* Board revision number from SPROM. */

	u16 board_num;		/* Board number from SPROM. */