ar71xx: fix MAC address swapping on WNR2200 and fix the WLAN MAC address

[openwrt.git] / target / linux / ar71xx / files / arch / mips / ath79 / mach-wnr2200.c

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
index 502fd5e..9f37f25 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
@@ -36,67 +36,67 @@
 #define WNR2200_GPIO_LED_LAN4_GREEN    16
 #define WNR2200_GPIO_LED_PWR_AMBER     21
 #define WNR2200_GPIO_LED_PWR_GREEN     22
-
+#define WNR2200_GPIO_USB_5V            4
 #define WNR2200_GPIO_USB_POWER         24
 
 #define WNR2200_KEYS_POLL_INTERVAL     20 /* msecs */
 #define WNR2200_KEYS_DEBOUNCE_INTERVAL (3 * WNR2200_KEYS_POLL_INTERVAL)
 
-#define WNR2200_MAC0_OFFSET            0
-#define WNR2200_MAC1_OFFSET            6
+#define WNR2200_MAC0_OFFSET            6
+#define WNR2200_MAC1_OFFSET            0
 #define WNR2200_PCIE_CALDATA_OFFSET    0x1000
 
 static struct gpio_led wnr2200_leds_gpio[] __initdata = {
        {
-               .name           = "wnr2200:amber:lan2",
+               .name           = "netgear:amber:lan2",
                .gpio           = WNR2200_GPIO_LED_LAN2_AMBER,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:amber:lan4",
+               .name           = "netgear:amber:lan4",
                .gpio           = WNR2200_GPIO_LED_LAN4_AMBER,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:green:wps",
+               .name           = "netgear:green:wps",
                .gpio           = WNR2200_GPIO_LED_WPS,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:green:wan",
+               .name           = "netgear:green:wan",
                .gpio           = WNR2200_GPIO_LED_WAN_GREEN,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:green:usb",
+               .name           = "netgear:green:usb",
                .gpio           = WNR2200_GPIO_LED_USB,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:amber:lan3",
+               .name           = "netgear:amber:lan3",
                .gpio           = WNR2200_GPIO_LED_LAN3_AMBER,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:amber:wan",
+               .name           = "netgear:amber:wan",
                .gpio           = WNR2200_GPIO_LED_WAN_AMBER,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:green:lan1",
+               .name           = "netgear:green:lan1",
                .gpio           = WNR2200_GPIO_LED_LAN1_GREEN,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:green:lan2",
+               .name           = "netgear:green:lan2",
                .gpio           = WNR2200_GPIO_LED_LAN2_GREEN,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:green:lan3",
+               .name           = "netgear:green:lan3",
                .gpio           = WNR2200_GPIO_LED_LAN3_GREEN,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:green:lan4",
+               .name           = "netgear:green:lan4",
                .gpio           = WNR2200_GPIO_LED_LAN4_GREEN,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:anber:power",
+               .name           = "netgear:amber:power",
                .gpio           = WNR2200_GPIO_LED_PWR_AMBER,
                .active_low     = 1,
        }, {
-               .name           = "wnr2200:green:power",
+               .name           = "netgear:green:power",
                .gpio           = WNR2200_GPIO_LED_PWR_GREEN,
                .active_low     = 1,
        }
@@ -121,15 +121,16 @@ static void __init wnr2200_setup(void)
        ath79_register_eth(1);
 
        ath79_register_m25p80(NULL);
-       ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET, NULL);
+       ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET,
+                     art + WNR2200_MAC0_OFFSET);
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2200_leds_gpio),
                                        wnr2200_leds_gpio);
 
        /* enable power for the USB port */
-       gpio_request_one(WNR2200_GPIO_USB_POWER,
-                       GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-                       "USB power");
+       ap9x_pci_setup_wmac_gpio(0,
+               BIT(WNR2200_GPIO_USB_5V),
+               BIT(WNR2200_GPIO_USB_5V));
 
        ath79_register_usb();
 }