projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: fix random wireless mac address on the TEW-632BRP/DIR-615 boards
[openwrt-10.03/.git]
/
target
/
linux
/
ar71xx
/
files
/
arch
/
mips
/
ar71xx
/
mach-dir-615-c1.c
diff --git
a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
index b5dde368b6cdbc70a5334111080234a90718a730..e3b6aabeb0bc0c1d0b03d5492ea11332ec4776a9 100644
(file)
--- a/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
+++ b/
target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
@@
-20,6
+20,7
@@
#include "dev-ar913x-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
#include "dev-ar913x-wmac.h"
#include "dev-gpio-buttons.h"
#include "dev-leds-gpio.h"
+#include "nvram.h"
#define DIR_615C1_GPIO_LED_ORANGE_STATUS 1 /* ORANGE:STATUS:TRICOLOR */
#define DIR_615C1_GPIO_LED_BLUE_WPS 3 /* BLUE:WPS */
#define DIR_615C1_GPIO_LED_ORANGE_STATUS 1 /* ORANGE:STATUS:TRICOLOR */
#define DIR_615C1_GPIO_LED_BLUE_WPS 3 /* BLUE:WPS */
@@
-36,6
+37,9
@@
#define DIR_615C1_BUTTONS_POLL_INTERVAL 20
#define DIR_615C1_BUTTONS_POLL_INTERVAL 20
+#define DIR_615C1_CONFIG_ADDR 0x1f020000
+#define DIR_615C1_CONFIG_SIZE 0x10000
+
#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition dir_615c1_partitions[] = {
{
#ifdef CONFIG_MTD_PARTITIONS
static struct mtd_partition dir_615c1_partitions[] = {
{
@@
-126,7
+130,16
@@
static struct gpio_button dir_615c1_gpio_buttons[] __initdata = {
static void __init dir_615c1_setup(void)
{
static void __init dir_615c1_setup(void)
{
+ const char *config = (char *) KSEG1ADDR(DIR_615C1_CONFIG_ADDR);
u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+ u8 mac[6];
+ u8 *wlan_mac = NULL;
+
+ if (nvram_parse_mac_addr(config, DIR_615C1_CONFIG_SIZE,
+ "lan_mac=", mac) == 0) {
+ ar71xx_set_mac_base(mac);
+ wlan_mac = mac;
+ }
ar71xx_add_device_mdio(0x0);
ar71xx_add_device_mdio(0x0);
@@
-150,7
+163,7
@@
static void __init dir_615c1_setup(void)
ARRAY_SIZE(dir_615c1_gpio_buttons),
dir_615c1_gpio_buttons);
ARRAY_SIZE(dir_615c1_gpio_buttons),
dir_615c1_gpio_buttons);
- ar913x_add_device_wmac(eeprom,
NULL
);
+ ar913x_add_device_wmac(eeprom,
wlan_mac
);
}
MIPS_MACHINE(AR71XX_MACH_DIR_615_C1, "D-Link DIR-615 rev. C1", dir_615c1_setup);
}
MIPS_MACHINE(AR71XX_MACH_DIR_615_C1, "D-Link DIR-615 rev. C1", dir_615c1_setup);