From 5c1d5456c19281d1499c81be1cdca366be4a09dd Mon Sep 17 00:00:00 2001 From: Magnus Damm Date: Tue, 27 Oct 2009 10:47:34 +0000 Subject: [PATCH] --- yaml --- r: 173448 b: refs/heads/master c: 8013cc9a5d2f6dcb79ffdcf707cf90ba120edfec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/boards/mach-se/7724/setup.c | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 1a7e8c71736c..b5d28315f4a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b3b21f788a9d7ff999544bf9b7ba950f68a9357 +refs/heads/master: 8013cc9a5d2f6dcb79ffdcf707cf90ba120edfec diff --git a/trunk/arch/sh/boards/mach-se/7724/setup.c b/trunk/arch/sh/boards/mach-se/7724/setup.c index ce6b36ebe64d..4488b3e774df 100644 --- a/trunk/arch/sh/boards/mach-se/7724/setup.c +++ b/trunk/arch/sh/boards/mach-se/7724/setup.c @@ -507,7 +507,7 @@ static int __init sh_eth_is_eeprom_ready(void) static void __init sh_eth_init(void) { int i; - u16 mac[3]; + u16 mac; /* check EEPROM status */ if (!sh_eth_is_eeprom_ready()) @@ -521,16 +521,10 @@ static void __init sh_eth_init(void) if (!sh_eth_is_eeprom_ready()) return; - mac[i] = ctrl_inw(EEPROM_DATA); - mac[i] = ((mac[i] & 0xFF) << 8) | (mac[i] >> 8); /* swap */ + mac = ctrl_inw(EEPROM_DATA); + sh_eth_plat.mac_addr[i << 1] = mac & 0xff; + sh_eth_plat.mac_addr[(i << 1) + 1] = mac >> 8; } - - /* reset sh-eth */ - ctrl_outl(0x1, SH_ETH_ADDR + 0x0); - - /* set MAC addr */ - ctrl_outl(((mac[0] << 16) | (mac[1])), SH_ETH_MAHR); - ctrl_outl((mac[2]), SH_ETH_MALR); } #define SW4140 0xBA201000