ar71xx: fix whitespaces nits

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
index 90d9dd1..3586026 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
@@ -1,7 +1,7 @@
 /*
  *  Linksys WRT400N board support
  *
- *  Copyright (C) 2009 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2009-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2009 Imre Kaloz <kaloz@openwrt.org>
  *
  *  This program is free software; you can redistribute it and/or modify it
@@ -9,17 +9,17 @@
  *  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-ap94-pci.h"
+#include "dev-m25p80.h"
+#include "dev-gpio-buttons.h"
+#include "dev-leds-gpio.h"
 
 #define WRT400N_GPIO_LED_ORANGE        5
 #define WRT400N_GPIO_LED_GREEN 4
@@ -31,6 +31,10 @@
 
 #define WRT400N_BUTTONS_POLL_INTERVAL  20
 
+#define WRT400N_MAC_ADDR_OFFSET                0x120c
+#define WRT400N_CALDATA0_OFFSET                0x1000
+#define WRT400N_CALDATA1_OFFSET                0x5000
+
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition wrt400n_partitions[] = {
        {
@@ -38,60 +42,54 @@ static struct mtd_partition wrt400n_partitions[] = {
                .offset         = 0,
                .size           = 0x030000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "env",
                .offset         = 0x030000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "linux",
                .offset         = 0x040000,
                .size           = 0x140000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x180000,
                .size           = 0x630000,
-       } , {
+       }, {
                .name           = "nvram",
                .offset         = 0x7b0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "factory",
                .offset         = 0x7c0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "language",
                .offset         = 0x7d0000,
                .size           = 0x020000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "caldata",
                .offset         = 0x7f0000,
                .size           = 0x010000,
                .mask_flags     = MTD_WRITEABLE,
+       }, {
+               .name           = "firmware",
+               .offset         = 0x040000,
+               .size           = 0x770000,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
 
 static struct flash_platform_data wrt400n_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = wrt400n_partitions,
-        .nr_parts       = ARRAY_SIZE(wrt400n_partitions),
+       .parts          = wrt400n_partitions,
+       .nr_parts       = ARRAY_SIZE(wrt400n_partitions),
 #endif
 };
 
-static struct spi_board_info wrt400n_spi_info[] = {
-       {
-               .bus_num        = 0,
-               .chip_select    = 0,
-               .max_speed_hz   = 25000000,
-               .modalias       = "m25p80",
-               .platform_data  = &wrt400n_flash_data,
-       }
-};
-
 static struct gpio_led wrt400n_leds_gpio[] __initdata = {
        {
                .name           = "wrt400n:green:status",
@@ -116,15 +114,15 @@ static struct gpio_button wrt400n_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .threshold      = 3,
                .gpio           = WRT400N_GPIO_BTN_RESET,
                .active_low     = 1,
-       } , {
+       }, {
                .desc           = "wlsec",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .threshold      = 3,
                .gpio           = WRT400N_GPIO_BTN_WLSEC,
                .active_low     = 1,
        }
@@ -132,22 +130,24 @@ static struct gpio_button wrt400n_gpio_buttons[] __initdata = {
 
 static void __init wrt400n_setup(void)
 {
+       u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
+       u8 *mac = art + WRT400N_MAC_ADDR_OFFSET;
+
        ar71xx_add_device_mdio(0x0);
 
+       ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 1);
        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, mac, 2);
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.phy_mask = 0x10;
 
        ar71xx_add_device_eth(0);
        ar71xx_add_device_eth(1);
 
-       ar71xx_add_device_spi(NULL, wrt400n_spi_info,
-                             ARRAY_SIZE(wrt400n_spi_info));
+       ar71xx_add_device_m25p80(&wrt400n_flash_data);
 
        ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(wrt400n_leds_gpio),
                                        wrt400n_leds_gpio);
@@ -156,7 +156,8 @@ static void __init wrt400n_setup(void)
                                        ARRAY_SIZE(wrt400n_gpio_buttons),
                                        wrt400n_gpio_buttons);
 
-       /* TODO: PCI support */
+       ap94_pci_init(art + WRT400N_CALDATA0_OFFSET, NULL,
+                     art + WRT400N_CALDATA1_OFFSET, NULL);
 }
 
-MIPS_MACHINE(AR71XX_MACH_WRT400N, "Linksys WRT400N", wrt400n_setup);
+MIPS_MACHINE(AR71XX_MACH_WRT400N, "WRT400N", "Linksys WRT400N", wrt400n_setup);