treewide: fix replace nbd@openwrt.org with nbd@nbd.name

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

diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
index 1223e84..ec3f1ff 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c
@@ -1,7 +1,7 @@
 /*
  *  Buffalo WZR-HP-AG300H board support
  *
- *  Copyright (C) 2011 Felix Fietkau <nbd@openwrt.org>
+ *  Copyright (C) 2011 Felix Fietkau <nbd@nbd.name>
  *
  *  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
@@ -43,22 +43,14 @@ static struct mtd_partition wzrhpag300h_flash_partitions[] = {
                .size           = 0x0010000,
                .mask_flags     = MTD_WRITEABLE,
        }, {
-               .name           = "kernel",
+               .name           = "firmware",
                .offset         = 0x0060000,
-               .size           = 0x0100000,
-       }, {
-               .name           = "rootfs",
-               .offset         = 0x0160000,
-               .size           = 0x1e90000,
+               .size           = 0x1f90000,
        }, {
                .name           = "user_property",
                .offset         = 0x1ff0000,
                .size           = 0x0010000,
                .mask_flags     = MTD_WRITEABLE,
-       }, {
-               .name           = "firmware",
-               .offset         = 0x0060000,
-               .size           = 0x1f90000,
        }
 };
 
@@ -75,6 +67,47 @@ static struct gpio_led wzrhpag300h_leds_gpio[] __initdata = {
        },
 };
 
+static struct gpio_led wzrhpag300h_wmac0_leds_gpio[] = {
+        {
+                .name           = "buffalo:amber:band2g",
+                .gpio           = 1,
+                .active_low     = 1,
+       },
+        {
+                .name           = "buffalo:green:usb",
+                .gpio           = 3,
+                .active_low     = 1,
+       },
+        {
+                .name           = "buffalo:green:band2g",
+                .gpio           = 5,
+                .active_low     = 1,
+       },
+};
+
+static struct gpio_led wzrhpag300h_wmac1_leds_gpio[] = {
+        {
+                .name           = "buffalo:green:band5g",
+                .gpio           = 1,
+                .active_low     = 1,
+       },
+        {
+                .name           = "buffalo:green:router",
+                .gpio           = 3,
+                .active_low     = 1,
+       },
+        {
+                .name           = "buffalo:blue:movie_engine",
+                .gpio           = 4,
+                .active_low     = 1,
+       },
+        {
+                .name           = "buffalo:amber:band5g",
+                .gpio           = 5,
+                .active_low     = 1,
+       },
+};
+
 static struct gpio_keys_button wzrhpag300h_gpio_keys[] __initdata = {
        {
                .desc           = "reset",
@@ -99,18 +132,25 @@ static struct gpio_keys_button wzrhpag300h_gpio_keys[] __initdata = {
                .active_low     = 1,
        }, {
                .desc           = "router_auto",
-               .type           = EV_KEY,
+               .type           = EV_SW,
                .code           = BTN_6,
                .debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = 6,
                .active_low     = 1,
        }, {
                .desc           = "router_off",
-               .type           = EV_KEY,
+               .type           = EV_SW,
                .code           = BTN_5,
                .debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
                .gpio           = 7,
                .active_low     = 1,
+       }, {
+               .desc           = "movie_engine",
+               .type           = EV_SW,
+               .code           = BTN_7,
+               .debounce_interval = WZRHPAG300H_KEYS_DEBOUNCE_INTERVAL,
+               .gpio           = 8,
+               .active_low     = 1,
        }
 };
 
@@ -137,9 +177,9 @@ static void __init wzrhpag300h_setup(void)
        ath79_register_eth(0);
        ath79_register_eth(1);
 
+       gpio_request_one(2, GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
+                        "USB power");
        ath79_register_usb();
-       gpio_request(2, "usb");
-       gpio_direction_output(2, 1);
 
        ath79_register_leds_gpio(-1, ARRAY_SIZE(wzrhpag300h_leds_gpio),
                                        wzrhpag300h_leds_gpio);
@@ -151,8 +191,15 @@ static void __init wzrhpag300h_setup(void)
        ath79_register_m25p80_multi(&wzrhpag300h_flash_data);
 
        ap94_pci_init(eeprom1, mac1, eeprom2, mac2);
+
+       ap9x_pci_setup_wmac_led_pin(0, 1);
+       ap9x_pci_setup_wmac_led_pin(1, 5);
+
+       ap9x_pci_setup_wmac_leds(0, wzrhpag300h_wmac0_leds_gpio,
+                               ARRAY_SIZE(wzrhpag300h_wmac0_leds_gpio));
+       ap9x_pci_setup_wmac_leds(1, wzrhpag300h_wmac1_leds_gpio,
+                               ARRAY_SIZE(wzrhpag300h_wmac1_leds_gpio));
 }
 
 MIPS_MACHINE(ATH79_MACH_WZR_HP_AG300H, "WZR-HP-AG300H",
-            "Buffalo WZR-HP-AG300H", wzrhpag300h_setup);
-
+            "Buffalo WZR-HP-AG300H/WZR-600DHP", wzrhpag300h_setup);