ar71xx: merge dir-600-a1 fix from r23432 (fixes #7563)

[openwrt-10.03/.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-dir-600-a1.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
index f3fbadab1d2476bea060e61954fc064585886952..ed9d5cc588ca3a52cf2eb09c49cfe1848e2ce80a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
@@ -20,6 +20,7 @@
 #include "dev-ap91-pci.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
+#include "nvram.h"
 
 #define DIR_600_A1_GPIO_LED_WPS                        0
 #define DIR_600_A1_GPIO_LED_POWER_AMBER                1
@@ -30,6 +31,9 @@
 
 #define DIR_600_A1_BUTTONS_POLL_INTERVAL       20
 
+#define DIR_600_A1_NVRAM_ADDR  0x1f030000
+#define DIR_600_A1_NVRAM_SIZE  0x10000
+
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition dir_600_a1_partitions[] = {
        {
@@ -108,8 +112,14 @@ static struct gpio_button dir_600_a1_gpio_buttons[] __initdata = {
 
 static void __init dir_600_a1_setup(void)
 {
-       u8 *mac = (u8 *) KSEG1ADDR(0x1fff0000);
+       const char *nvram = (char *) KSEG1ADDR(DIR_600_A1_NVRAM_ADDR);
        u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
+       u8 mac_buff[6];
+       u8 *mac = NULL;
+
+       if (nvram_parse_mac_addr(nvram, DIR_600_A1_NVRAM_SIZE,
+                                "lan_mac=", mac_buff) == 0)
+               mac = mac_buff;
 
        ar71xx_add_device_m25p80(&dir_600_a1_flash_data);
 
@@ -120,8 +130,24 @@ static void __init dir_600_a1_setup(void)
                                        ARRAY_SIZE(dir_600_a1_gpio_buttons),
                                        dir_600_a1_gpio_buttons);
 
-       ap91_eth_init(mac);
-       ap91_pci_init(ee, NULL);
+       ar71xx_eth1_data.has_ar7240_switch = 1;
+       ar71xx_set_mac_base(mac);
+
+       /* WAN port */
+       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+       ar71xx_eth0_data.speed = SPEED_100;
+       ar71xx_eth0_data.duplex = DUPLEX_FULL;
+
+       /* LAN ports */
+       ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
+       ar71xx_eth1_data.speed = SPEED_1000;
+       ar71xx_eth1_data.duplex = DUPLEX_FULL;
+
+       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_eth(1);
+       ar71xx_add_device_eth(0);
+
+       ap91_pci_init(ee, mac);
 }
 
 MIPS_MACHINE(AR71XX_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1",