ar71xx: merge dev-ar9{13,34}x-wmac into dev-ar9xxx-wmac
[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-ap81.c
index 98a319aa7a9b2a54807f43efaa9996ebff82226a..a8d1818ae7def294fc3cda605d46ab0f57615dfe 100644 (file)
@@ -9,17 +9,23 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
-#include <linux/spi/spi.h>
-#include <linux/spi/flash.h>
-#include <linux/input.h>
 
-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 
+#include "machtype.h"
 #include "devices.h"
+#include "dev-m25p80.h"
+#include "dev-ar9xxx-wmac.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
+#include "dev-usb.h"
+
+#define AP81_GPIO_LED_STATUS   1
+#define AP81_GPIO_LED_AOSS     3
+#define AP81_GPIO_LED_WLAN     6
+#define AP81_GPIO_LED_POWER    14
 
 #define AP81_GPIO_BTN_SW4      12
 #define AP81_GPIO_BTN_SW1      21
@@ -33,19 +39,19 @@ static struct mtd_partition ap81_partitions[] = {
                .offset         = 0,
                .size           = 0x040000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "u-boot-env",
                .offset         = 0x040000,
                .size           = 0x010000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x050000,
                .size           = 0x500000,
-       } , {
+       }, {
                .name           = "uImage",
                .offset         = 0x550000,
                .size           = 0x100000,
-       } , {
+       }, {
                .name           = "ART",
                .offset         = 0x650000,
                .size           = 0x1b0000,
@@ -56,18 +62,28 @@ static struct mtd_partition ap81_partitions[] = {
 
 static struct flash_platform_data ap81_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = ap81_partitions,
-        .nr_parts       = ARRAY_SIZE(ap81_partitions),
+       .parts          = ap81_partitions,
+       .nr_parts       = ARRAY_SIZE(ap81_partitions),
 #endif
 };
 
-static struct spi_board_info ap81_spi_info[] = {
+static struct gpio_led ap81_leds_gpio[] __initdata = {
        {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-               .platform_data  = &ap81_flash_data,
+               .name           = "ap81:green:status",
+               .gpio           = AP81_GPIO_LED_STATUS,
+               .active_low     = 1,
+       }, {
+               .name           = "ap81:amber:aoss",
+               .gpio           = AP81_GPIO_LED_AOSS,
+               .active_low     = 1,
+       }, {
+               .name           = "ap81:green:wlan",
+               .gpio           = AP81_GPIO_LED_WLAN,
+               .active_low     = 1,
+       }, {
+               .name           = "ap81:green:power",
+               .gpio           = AP81_GPIO_LED_POWER,
+               .active_low     = 1,
        }
 };
 
@@ -76,14 +92,14 @@ static struct gpio_button ap81_gpio_buttons[] __initdata = {
                .desc           = "sw1",
                .type           = EV_KEY,
                .code           = BTN_0,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = AP81_GPIO_BTN_SW1,
                .active_low     = 1,
-       } , {
+       }, {
                .desc           = "sw4",
                .type           = EV_KEY,
                .code           = BTN_1,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = AP81_GPIO_BTN_SW4,
                .active_low     = 1,
        }
@@ -91,14 +107,17 @@ static struct gpio_button ap81_gpio_buttons[] __initdata = {
 
 static void __init ap81_setup(void)
 {
+       u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+
        ar71xx_add_device_mdio(0x0);
 
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth0_data.phy_mask = 0xf;
        ar71xx_eth0_data.speed = SPEED_100;
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
        ar71xx_eth0_data.has_ar8216 = 1;
 
+       ar71xx_init_mac(ar71xx_eth1_data.mac_addr, eeprom, 1);
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.phy_mask = 0x10;
 
@@ -107,14 +126,16 @@ static void __init ap81_setup(void)
 
        ar71xx_add_device_usb();
 
-       ar71xx_add_device_spi(NULL, ap81_spi_info,
-                             ARRAY_SIZE(ap81_spi_info));
+       ar71xx_add_device_m25p80(&ap81_flash_data);
+
+       ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(ap81_leds_gpio),
+                                       ap81_leds_gpio);
 
        ar71xx_add_device_gpio_buttons(-1, AP81_BUTTONS_POLL_INTERVAL,
                                        ARRAY_SIZE(ap81_gpio_buttons),
                                        ap81_gpio_buttons);
 
-       ar91xx_add_device_wmac();
+       ar9xxx_add_device_wmac(eeprom, NULL);
 }
 
-MIPS_MACHINE(AR71XX_MACH_AP81, "Atheros AP81", ap81_setup);
+MIPS_MACHINE(AR71XX_MACH_AP81, "AP81", "Atheros AP81", ap81_setup);