X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fmach-wrt400n.c;h=5e5536a9f8149c5883eb0c80b26c4f82c31ae308;hb=2fc3aecc564bb8aeb6dcde3fd2e49ec38e9eb630;hp=28e16421e68d3b9e0767f1b724ba9c4ebbc60c28;hpb=946afd2924a8e622778a23ea989ebdafa48ca11c;p=openwrt%2Fsvn-archive%2Farchive.git

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 28e16421e6..5e5536a9f8 100644
--- 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,16 @@
  *  by the Free Software Foundation.
  */
 
-#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.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-gpio-buttons.h"
 #include "dev-leds-gpio.h"
 
 #define WRT400N_GPIO_LED_ORANGE	5
@@ -32,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[] = {
 	{
@@ -111,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,
 	}
@@ -127,14 +130,17 @@ 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;
 
@@ -150,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);