ar71xx: add an id argument to ar71xx_add_device_mdio

[oweals/openwrt.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 d76e9b649b405f096e04035adb78881c11005077..e503c583eb62faf03c7feaa176961679bbc2a845 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
@@ -19,6 +19,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
@@ -27,7 +28,11 @@
 #define DIR_600_A1_GPIO_BTN_RESET              8
 #define DIR_600_A1_GPIO_BTN_WPS                        12
 
-#define DIR_600_A1_BUTTONS_POLL_INTERVAL       20
+#define DIR_600_A1_KEYS_POLL_INTERVAL  20      /* msecs */
+#define DIR_600_A1_KEYS_DEBOUNCE_INTERVAL (3 * DIR_600_A1_KEYS_POLL_INTERVAL)
+
+#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[] = {
@@ -68,8 +73,8 @@ static struct mtd_partition dir_600_a1_partitions[] = {
 
 static struct flash_platform_data dir_600_a1_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = dir_600_a1_partitions,
-        .nr_parts       = ARRAY_SIZE(dir_600_a1_partitions),
+       .parts          = dir_600_a1_partitions,
+       .nr_parts       = ARRAY_SIZE(dir_600_a1_partitions),
 #endif
 };
 
@@ -87,19 +92,19 @@ static struct gpio_led dir_600_a1_leds_gpio[] __initdata = {
        }
 };
 
-static struct gpio_button dir_600_a1_gpio_buttons[] __initdata = {
+static struct gpio_keys_button dir_600_a1_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .debounce_interval = DIR_600_A1_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = DIR_600_A1_GPIO_BTN_RESET,
                .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .debounce_interval = DIR_600_A1_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = DIR_600_A1_GPIO_BTN_WPS,
                .active_low     = 1,
        }
@@ -107,43 +112,47 @@ 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) {
+               ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac_buff, 0);
+               ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac_buff, 1);
+               mac = mac_buff;
+       }
+
+       ar71xx_add_device_m25p80(&dir_600_a1_flash_data);
+
+       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(dir_600_a1_leds_gpio),
+                                       dir_600_a1_leds_gpio);
 
-       ar71xx_set_mac_base(mac);
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_register_gpio_keys_polled(-1, DIR_600_A1_KEYS_POLL_INTERVAL,
+                                        ARRAY_SIZE(dir_600_a1_gpio_keys),
+                                        dir_600_a1_gpio_keys);
+
+       ar71xx_eth1_data.has_ar7240_switch = 1;
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
 
        /* WAN port */
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth0_data.phy_mask = 0x0;
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
-       ar71xx_eth0_data.fifo_cfg1 = 0x0fff0000;
-       ar71xx_eth0_data.fifo_cfg2 = 0x00001fff;
-       ar71xx_eth0_data.fifo_cfg3 = 0x008001ff;
+       ar71xx_eth0_data.phy_mask = BIT(4);
 
        /* LAN ports */
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth1_data.phy_mask = 0x0;
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
-       ar71xx_eth1_data.fifo_cfg1 = 0x0fff0000;
-       ar71xx_eth1_data.fifo_cfg2 = 0x00001fff;
-       ar71xx_eth1_data.fifo_cfg3 = 0x008001ff;
 
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 
-       ar71xx_add_device_m25p80(&dir_600_a1_flash_data);
-
-       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(dir_600_a1_leds_gpio),
-                                       dir_600_a1_leds_gpio);
-
-       ar71xx_add_device_gpio_buttons(-1, DIR_600_A1_BUTTONS_POLL_INTERVAL,
-                                       ARRAY_SIZE(dir_600_a1_gpio_buttons),
-                                       dir_600_a1_gpio_buttons);
-
-       ap91_pci_init(ee, NULL);
+       ap91_pci_init(ee, mac);
 }
 
 MIPS_MACHINE(AR71XX_MACH_DIR_600_A1, "DIR-600-A1", "D-Link DIR-600 rev. A1",