ar71xx: Set eth1 MAC address from EEPROM for WNDR3700

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-wndr3700.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
index 7cf8e315d170a3cf35fc209b98e5d01ea535b987..52ddae5a1e33c5f87fcdb42282689c15432750d5 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wndr3700.c
@@ -2,7 +2,7 @@
  *  Netgear WNDR3700 board support
  *
  *  Copyright (C) 2009 Marco Porsch
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
  *  under the terms of the GNU General Public License version 2 as published
@@ -13,11 +13,11 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
-#include <linux/rtl8366_smi.h>
+#include <linux/rtl8366s.h>
 
-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 
+#include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
 #include "dev-ap94-pci.h"
@@ -29,6 +29,7 @@
 #define WNDR3700_GPIO_LED_POWER_ORANGE 1
 #define WNDR3700_GPIO_LED_POWER_GREEN  2
 #define WNDR3700_GPIO_LED_WPS_GREEN    4
+#define WNDR3700_GPIO_LED_WAN_GREEN    6
 
 #define WNDR3700_GPIO_BTN_WPS          3
 #define WNDR3700_GPIO_BTN_RESET                8
@@ -39,6 +40,9 @@
 
 #define WNDR3700_BUTTONS_POLL_INTERVAL    20
 
+#define WNDR3700_ETH0_MAC_OFFSET       0
+#define WNDR3700_ETH1_MAC_OFFSET       0x6
+
 #define WNDR3700_WMAC0_MAC_OFFSET      0
 #define WNDR3700_WMAC1_MAC_OFFSET      0xc
 #define WNDR3700_CALDATA0_OFFSET       0x1000
@@ -118,6 +122,10 @@ static struct gpio_led wndr3700_leds_gpio[] __initdata = {
                .name           = "wndr3700:orange:wps",
                .gpio           = WNDR3700_GPIO_LED_WPS_ORANGE,
                .active_low     = 1,
+       }, {
+               .name           = "wndr3700:green:wan",
+               .gpio           = WNDR3700_GPIO_LED_WAN_GREEN,
+               .active_low     = 1,
        }
 };
 
@@ -125,34 +133,37 @@ static struct gpio_button wndr3700_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .threshold      = 3,
                .gpio           = WNDR3700_GPIO_BTN_RESET,
+               .active_low     = 1,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .threshold      = 3,
                .gpio           = WNDR3700_GPIO_BTN_WPS,
+               .active_low     = 1,
        } , {
                .desc           = "wifi",
                .type           = EV_KEY,
                .code           = BTN_2,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = WNDR3700_GPIO_BTN_WIFI,
+               .active_low     = 1,
        }
 };
 
-static struct rtl8366_smi_platform_data wndr3700_rtl8366_smi_data = {
+static struct rtl8366s_platform_data wndr3700_rtl8366s_data = {
        .gpio_sda        = WNDR3700_GPIO_RTL8366_SDA,
        .gpio_sck        = WNDR3700_GPIO_RTL8366_SCK,
 };
 
-static struct platform_device wndr3700_rtl8366_smi_device = {
-       .name           = "rtl8366-smi",
+static struct platform_device wndr3700_rtl8366s_device = {
+       .name           = RTL8366S_DRIVER_NAME,
        .id             = -1,
        .dev = {
-               .platform_data  = &wndr3700_rtl8366_smi_data,
+               .platform_data  = &wndr3700_rtl8366s_data,
        }
 };
 
@@ -160,17 +171,18 @@ static void __init wndr3700_setup(void)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
 
-       ar71xx_set_mac_base(art);
-
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr,
+                       art + WNDR3700_ETH0_MAC_OFFSET, 0);
        ar71xx_eth0_pll_data.pll_1000 = 0x11110000;
-       ar71xx_eth0_data.mii_bus_dev = &wndr3700_rtl8366_smi_device.dev;
+       ar71xx_eth0_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev;
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
-       ar71xx_eth0_data.phy_mask = 0xf;
        ar71xx_eth0_data.speed = SPEED_1000;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
 
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr,
+                       art + WNDR3700_ETH1_MAC_OFFSET, 0);
        ar71xx_eth1_pll_data.pll_1000 = 0x11110000;
-       ar71xx_eth1_data.mii_bus_dev = &wndr3700_rtl8366_smi_device.dev;
+       ar71xx_eth1_data.mii_bus_dev = &wndr3700_rtl8366s_device.dev;
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth1_data.phy_mask = 0x10;
 
@@ -188,13 +200,15 @@ static void __init wndr3700_setup(void)
                                      ARRAY_SIZE(wndr3700_gpio_buttons),
                                      wndr3700_gpio_buttons);
 
-       platform_device_register(&wndr3700_rtl8366_smi_device);
+       platform_device_register(&wndr3700_rtl8366s_device);
        platform_device_register_simple("wndr3700-led-usb", -1, NULL, 0);
 
+       ap94_pci_enable_quirk_wndr3700();
        ap94_pci_init(art + WNDR3700_CALDATA0_OFFSET,
                      art + WNDR3700_WMAC0_MAC_OFFSET,
                      art + WNDR3700_CALDATA1_OFFSET,
                      art + WNDR3700_WMAC1_MAC_OFFSET);
 }
 
-MIPS_MACHINE(AR71XX_MACH_WNDR3700, "NETGEAR WNDR3700", wndr3700_setup);
+MIPS_MACHINE(AR71XX_MACH_WNDR3700, "WNDR3700", "NETGEAR WNDR3700",
+            wndr3700_setup);