diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-20 16:41:36 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-20 16:41:36 +0000 |
| commit | 784e34f43a1a39a9d82f486d7298292432a67557 (patch) | |
| tree | aafd4aec48dfbf3e202504dd4189c36f7f005158 /target/linux/ar71xx | |
| parent | 9738028ba7b1bf3bdca0f536baf678d0608c9853 (diff) | |
| download | upstream-784e34f43a1a39a9d82f486d7298292432a67557.tar.gz upstream-784e34f43a1a39a9d82f486d7298292432a67557.tar.bz2 upstream-784e34f43a1a39a9d82f486d7298292432a67557.zip | |
ar71xx: tew-712br: use ath79_parse_ascii_mac helper
Remove the local MAC address parser function and use
the generic one instead.
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38090 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar71xx')
| -rw-r--r-- | target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c index b0bc51bfeb..304b994887 100644 --- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c +++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tew-712br.c @@ -42,8 +42,10 @@ #define TEW_712BR_ART_ADDRESS 0x1f010000 #define TEW_712BR_CALDATA_OFFSET 0x1000 -#define TEW_712BR_LAN_MAC_ADDRESS 0x1f020004 -#define TEW_712BR_WAN_MAC_ADDRESS 0x1f020016 + +#define TEW_712BR_MAC_PART_ADDRESS 0x1f020000 +#define TEW_712BR_LAN_MAC_OFFSET 0x04 +#define TEW_712BR_WAN_MAC_OFFSET 0x16 static struct gpio_led tew_712br_leds_gpio[] __initdata = { { @@ -107,22 +109,10 @@ static struct gpio_keys_button tew_712br_gpio_keys[] __initdata = { } }; -static void __init tew_712br_read_ascii_mac(u8 *dest, unsigned int src_addr) -{ - int ret; - u8 *src = (u8 *)KSEG1ADDR(src_addr); - - ret = sscanf(src, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", - &dest[0], &dest[1], &dest[2], - &dest[3], &dest[4], &dest[5]); - - if (ret != ETH_ALEN) - memset(dest, 0, ETH_ALEN); -} - static void __init tew_712br_setup(void) { u8 *art = (u8 *) KSEG1ADDR(TEW_712BR_ART_ADDRESS); + u8 *mac = (u8 *) KSEG1ADDR(TEW_712BR_MAC_PART_ADDRESS); u8 lan_mac[ETH_ALEN]; u8 wan_mac[ETH_ALEN]; @@ -146,8 +136,8 @@ static void __init tew_712br_setup(void) ath79_register_m25p80(NULL); - tew_712br_read_ascii_mac(lan_mac, TEW_712BR_LAN_MAC_ADDRESS); - tew_712br_read_ascii_mac(wan_mac, TEW_712BR_WAN_MAC_ADDRESS); + ath79_parse_ascii_mac(mac + TEW_712BR_LAN_MAC_OFFSET, lan_mac); + ath79_parse_ascii_mac(mac + TEW_712BR_WAN_MAC_OFFSET, wan_mac); ath79_init_mac(ath79_eth0_data.mac_addr, wan_mac, 0); ath79_init_mac(ath79_eth1_data.mac_addr, lan_mac, 0); |