b5b630ae38
This adds support for kernel 4.1 and removes kernel 4.0. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 46166
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
From c58ec43eaca5f970911770c17cb3a29ac102656d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
|
|
Date: Tue, 12 May 2015 11:54:48 +0200
|
|
Subject: [PATCH] MIPS: BCM47xx: Extract info about et2 interface
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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: Rafał 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: Ralf Baechle <ralf@linux-mips.org>
|
|
---
|
|
arch/mips/bcm47xx/sprom.c | 6 ++++++
|
|
include/linux/ssb/ssb.h | 3 +++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
--- a/arch/mips/bcm47xx/sprom.c
|
|
+++ b/arch/mips/bcm47xx/sprom.c
|
|
@@ -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(
|
|
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);
|
|
|