ar71xx: WNR2000v3: fix for random WLAN MAC
[openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-wnr2000-v3.c
index 6acd991..59d10a9 100644 (file)
@@ -1,7 +1,8 @@
 /*
- *  NETGEAR WNR2000v3 board support
+ *  NETGEAR WNR2000v3/WNR612v2/WNR1000v2/WPN824N board support
  *
- *  Copytight (C) 2013 Mathieu Olivari <mathieu.olivari@gmail.com>
+ *  Copyright (C) 2015 Hartmut Knaack <knaack.h@gmx.de>
+ *  Copyright (C) 2013 Mathieu Olivari <mathieu.olivari@gmail.com>
  *  Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *  Copyright (C) 2008-2009 Andy Boyett <agb@openwrt.org>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <linux/kernel.h> /* for max() macro */
 
 #include <asm/mach-ath79/ath79.h>
+#include <asm/mach-ath79/ar71xx_regs.h> /* needed to disable switch LEDs */
+#include "common.h" /* needed to disable switch LEDs */
 
 #include "dev-ap9x-pci.h"
 #include "dev-eth.h"
 
 #define WNR612V2_GPIO_LED_PWR_GREEN    11
 
+#define WNR1000V2_GPIO_LED_PWR_AMBER   1
+#define WNR1000V2_GPIO_LED_PWR_GREEN   11
+
+/* Connected through AR7240 */
+#define WPN824N_GPIO_LED_WAN_AMBER     0
+#define WPN824N_GPIO_LED_STATUS_AMBER  1
+#define WPN824N_GPIO_LED_LAN1_AMBER    6 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
+#define WPN824N_GPIO_LED_LAN2_AMBER    7 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
+#define WPN824N_GPIO_LED_LAN3_AMBER    8 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
+#define WPN824N_GPIO_LED_LAN4_AMBER    12
+#define WPN824N_GPIO_LED_LAN1_GREEN    13
+#define WPN824N_GPIO_LED_LAN2_GREEN    14
+#define WPN824N_GPIO_LED_LAN3_GREEN    15 /* AR724X_GPIO_FUNC_CLK_OBS3_EN */
+#define WPN824N_GPIO_LED_LAN4_GREEN    16
+#define WPN824N_GPIO_LED_WAN_GREEN     17
+
+/* Connected through AR9285 */
+#define WPN824N_WGPIO_LED_PWR_GREEN    0
+#define WPN824N_WGPIO_LED_WLAN_BLUE    1
+#define WPN824N_WGPIO_LED_WPS1_BLUE    5
+#define WPN824N_WGPIO_LED_WPS2_BLUE    9
+#define WPN824N_WGPIO_LED_TEST_AMBER   10
+#define WPN824N_WGPIO_BTN_PUSH         6       /* currently unused */
+#define WPN824N_WGPIO_BTN_RESET                7       /* currently unused */
+#define WPN824N_WGPIO_BTN_WLAN         8       /* currently unused */
+
 #define WNR2000V3_KEYS_POLL_INTERVAL   20      /* msecs */
 #define WNR2000V3_KEYS_DEBOUNCE_INTERVAL       (3 * WNR2000V3_KEYS_POLL_INTERVAL)
 
 #define WNR2000V3_MAC0_OFFSET          0
 #define WNR2000V3_MAC1_OFFSET          6
 #define WNR2000V3_PCIE_CALDATA_OFFSET  0x1000
+#define WNR2000V3_WMAC_OFFSET          0x108c  /* wireless MAC is inside ART */
 
 static struct gpio_led wnr2000v3_leds_gpio[] __initdata = {
        {
@@ -58,6 +89,90 @@ static struct gpio_led wnr612v2_leds_gpio[] __initdata = {
        }
 };
 
+static struct gpio_led wnr1000v2_leds_gpio[] __initdata = {
+       {
+               .name           = "netgear:green:power",
+               .gpio           = WNR1000V2_GPIO_LED_PWR_GREEN,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:amber:power",
+               .gpio           = WNR1000V2_GPIO_LED_PWR_AMBER,
+               .active_low     = 1,
+       }
+};
+
+static struct gpio_led wpn824n_leds_gpio[] __initdata = {
+       {
+               .name           = "netgear:amber:wan",
+               .gpio           = WPN824N_GPIO_LED_WAN_AMBER,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:amber:status",
+               .gpio           = WPN824N_GPIO_LED_STATUS_AMBER,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:amber:lan1",
+               .gpio           = WPN824N_GPIO_LED_LAN1_AMBER,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:amber:lan2",
+               .gpio           = WPN824N_GPIO_LED_LAN2_AMBER,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:amber:lan3",
+               .gpio           = WPN824N_GPIO_LED_LAN3_AMBER,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:amber:lan4",
+               .gpio           = WPN824N_GPIO_LED_LAN4_AMBER,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:green:lan1",
+               .gpio           = WPN824N_GPIO_LED_LAN1_GREEN,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:green:lan2",
+               .gpio           = WPN824N_GPIO_LED_LAN2_GREEN,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:green:lan3",
+               .gpio           = WPN824N_GPIO_LED_LAN3_GREEN,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:green:lan4",
+               .gpio           = WPN824N_GPIO_LED_LAN4_GREEN,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:green:wan",
+               .gpio           = WPN824N_GPIO_LED_WAN_GREEN,
+               .active_low     = 1,
+       }
+};
+
+static struct gpio_led wpn824n_wmac_leds_gpio[] = {
+       {
+               .name           = "netgear:green:power",
+               .gpio           = WPN824N_WGPIO_LED_PWR_GREEN,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:blue:wlan",
+               .gpio           = WPN824N_WGPIO_LED_WLAN_BLUE,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:blue:wps1",
+               .gpio           = WPN824N_WGPIO_LED_WPS1_BLUE,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:blue:wps2",
+               .gpio           = WPN824N_WGPIO_LED_WPS2_BLUE,
+               .active_low     = 1,
+       }, {
+               .name           = "netgear:amber:test",
+               .gpio           = WPN824N_WGPIO_LED_TEST_AMBER,
+               .active_low     = 1,
+       }
+};
+
 static struct gpio_keys_button wnr2000v3_gpio_keys[] __initdata = {
        {
                .desc           = "wps",
@@ -68,7 +183,35 @@ static struct gpio_keys_button wnr2000v3_gpio_keys[] __initdata = {
        }
 };
 
-static void __init wnr_common_setup(void)
+/*
+ * For WNR2000v3 ART flash area used for WLAN MAC is usually empty (0xff)
+ * so ath9k driver uses random MAC instead each time module is loaded.
+ * To fix that, assign permanent WLAN MAC equal to ethN's MAC plus 1,
+ * so network interfaces get sequential addresses.
+ * If ART wireless MAC address field has been filled by user, use it.
+ */
+static void __init wnr_get_wmac(u8 *wmac_gen_addr, int mac0_art_offset,
+                               int mac1_art_offset, int wmac_art_offset)
+{
+       u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+       u8 *eth0_mac_addr = (u8 *) (art + mac0_art_offset);
+       u8 *eth1_mac_addr = (u8 *) (art + mac1_art_offset);
+       u8 *wlan_mac_addr = (u8 *) (art + wmac_art_offset);
+
+       /* only 0xff if all bits are set - address is invalid, empty area */
+       if ((wlan_mac_addr[0] & wlan_mac_addr[1] & wlan_mac_addr[2] &
+            wlan_mac_addr[3] & wlan_mac_addr[4] & wlan_mac_addr[5]) == 0xff) {
+               memcpy(wmac_gen_addr, eth0_mac_addr, 5);
+               wmac_gen_addr[5] = max(eth0_mac_addr[5], eth1_mac_addr[5]) + 1;
+
+               /* Avoid potential conflict in case max(0xff,0x00)+1==0x00 */
+               if (!wmac_gen_addr[5])
+                       wmac_gen_addr[5] = 1;
+       } else
+               memcpy(wmac_gen_addr, wlan_mac_addr, 6);
+}
+
+static void __init wnr_common_setup(u8 *wmac_addr)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
 
@@ -87,12 +230,17 @@ static void __init wnr_common_setup(void)
        ath79_register_eth(1);
 
        ath79_register_m25p80(NULL);
-       ap91_pci_init(art + WNR2000V3_PCIE_CALDATA_OFFSET, NULL);
+       ap91_pci_init(art + WNR2000V3_PCIE_CALDATA_OFFSET, wmac_addr);
 }
 
 static void __init wnr2000v3_setup(void)
 {
-       wnr_common_setup();
+       u8 wlan_mac_addr[6];
+
+       wnr_get_wmac(wlan_mac_addr, WNR2000V3_MAC0_OFFSET,
+                    WNR2000V3_MAC1_OFFSET, WNR2000V3_WMAC_OFFSET);
+
+       wnr_common_setup(wlan_mac_addr);
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2000v3_leds_gpio),
                                 wnr2000v3_leds_gpio);
@@ -106,10 +254,42 @@ MIPS_MACHINE(ATH79_MACH_WNR2000_V3, "WNR2000V3", "NETGEAR WNR2000 V3", wnr2000v3
 
 static void __init wnr612v2_setup(void)
 {
-       wnr_common_setup();
+       wnr_common_setup(NULL);
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr612v2_leds_gpio),
                                 wnr612v2_leds_gpio);
 }
 
 MIPS_MACHINE(ATH79_MACH_WNR612_V2, "WNR612V2", "NETGEAR WNR612 V2", wnr612v2_setup);
+
+static void __init wnr1000v2_setup(void)
+{
+       wnr_common_setup(NULL);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr1000v2_leds_gpio),
+                                wnr1000v2_leds_gpio);
+}
+
+MIPS_MACHINE(ATH79_MACH_WNR1000_V2, "WNR1000V2", "NETGEAR WNR1000 V2", wnr1000v2_setup);
+
+static void __init wpn824n_setup(void)
+{
+       ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE,
+                                 AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
+                                 AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
+                                 AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
+                                 AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
+                                 AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN |
+                                 AR724X_GPIO_FUNC_CLK_OBS3_EN);
+
+       wnr_common_setup(NULL);
+
+       ath79_register_leds_gpio(-1, ARRAY_SIZE(wpn824n_leds_gpio),
+                                wpn824n_leds_gpio);
+
+       ap9x_pci_setup_wmac_led_pin(0, WPN824N_WGPIO_LED_WLAN_BLUE);
+       ap9x_pci_setup_wmac_leds(0, wpn824n_wmac_leds_gpio,
+                                ARRAY_SIZE(wpn824n_wmac_leds_gpio));
+}
+
+MIPS_MACHINE(ATH79_MACH_WPN824N, "WPN824N", "NETGEAR WPN824N", wpn824n_setup);