linux-mips
[Top] [All Lists]

[MIPS] BCM47XX: use new SSB SPROM data structure

To: Ralf Baechle <ralf@linux-mips.org>
Subject: [MIPS] BCM47XX: use new SSB SPROM data structure
From: Aurelien Jarno <aurelien@aurel32.net>
Date: Mon, 18 Feb 2008 11:04:31 +0100
Cc: Adrian Bunk <bunk@kernel.org>, Larry Finger <Larry.Finger@lwfinger.net>, "John W. Linville" <linville@tuxdriver.com>, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
In-reply-to: <20080218100126.GA22519@hall.aurel32.net>
Mail-followup-to: Aurelien Jarno <aurelien@aurel32.net>, Ralf Baechle <ralf@linux-mips.org>, Adrian Bunk <bunk@kernel.org>, Larry Finger <Larry.Finger@lwfinger.net>, "John W. Linville" <linville@tuxdriver.com>, linux-mips@linux-mips.org, linux-kernel@vger.kernel.org
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <20080217200947.GH1403@cs181133002.pp.htv.fi> <20080218074944.GA9317@hall.aurel32.net> <20080218100126.GA22519@hall.aurel32.net>
Sender: linux-mips-bounce@linux-mips.org
User-agent: Mutt/1.5.13 (2006-08-11)
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>
---
 arch/mips/bcm47xx/setup.c   |   12 ++++++------
 arch/mips/bcm47xx/wgt634u.c |    2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/arch/mips/bcm47xx/setup.c b/arch/mips/bcm47xx/setup.c
index 1b6b0fa..8d36f18 100644
--- a/arch/mips/bcm47xx/setup.c
+++ b/arch/mips/bcm47xx/setup.c
@@ -92,17 +92,17 @@ static int bcm47xx_get_invariants(struct ssb_bus *bus,
        iv->sprom.revision = 3;
 
        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)
-               str2eaddr(buf, iv->sprom.r1.et1mac);
+               str2eaddr(buf, iv->sprom.et1mac);
        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)
-               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)
-               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)
-               iv->sprom.r1.et1mdcport = simple_strtoul(buf, NULL, 10);
+               iv->sprom.et1mdcport = simple_strtoul(buf, NULL, 10);
 
        return 0;
 }
diff --git a/arch/mips/bcm47xx/wgt634u.c b/arch/mips/bcm47xx/wgt634u.c
index 5a017ea..f21a206 100644
--- a/arch/mips/bcm47xx/wgt634u.c
+++ b/arch/mips/bcm47xx/wgt634u.c
@@ -50,7 +50,7 @@ static int __init wgt634u_init(void)
         * 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 &&
            ((et0mac[1] == 0x09 && et0mac[2] == 0x5b) ||
-- 
1.5.4.1


-- 
  .''`.  Aurelien Jarno             | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32@debian.org         | aurelien@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net

<Prev in Thread] Current Thread [Next in Thread>