X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fmach-tew-632brp.c;h=b7f9cb683d008c53d434ede993b2a8a4412f4315;hb=11a837ce029534fc38f6deb2a2f31d80fe5a1f7f;hp=cb2e16d25fa7ea59c905a1f70750c5e0b154e778;hpb=5ac400c7f1c26315df4237c52da9d91ef577bd5f;p=openwrt.git

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
index cb2e16d25f..b7f9cb683d 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
@@ -17,9 +17,10 @@
 #include "machtype.h"
 #include "devices.h"
 #include "dev-m25p80.h"
-#include "dev-ar913x-wmac.h"
+#include "dev-ar9xxx-wmac.h"
 #include "dev-gpio-buttons.h"
 #include "dev-leds-gpio.h"
+#include "nvram.h"
 
 #define TEW_632BRP_GPIO_LED_STATUS	1
 #define TEW_632BRP_GPIO_LED_WPS		3
@@ -27,7 +28,11 @@
 #define TEW_632BRP_GPIO_BTN_WPS		12
 #define TEW_632BRP_GPIO_BTN_RESET	21
 
-#define TEW_632BRP_BUTTONS_POLL_INTERVAL	20
+#define TEW_632BRP_KEYS_POLL_INTERVAL	20	/* msecs */
+#define TEW_632BRP_KEYS_DEBOUNCE_INTERVAL (3 * TEW_632BRP_KEYS_POLL_INTERVAL)
+
+#define TEW_632BRP_CONFIG_ADDR	0x1f020000
+#define TEW_632BRP_CONFIG_SIZE	0x10000
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition tew_632brp_partitions[] = {
@@ -36,24 +41,24 @@ static struct mtd_partition tew_632brp_partitions[] = {
 		.offset		= 0,
 		.size		= 0x020000,
 		.mask_flags	= MTD_WRITEABLE,
-	} , {
+	}, {
 		.name		= "config",
 		.offset		= 0x020000,
 		.size		= 0x010000,
-	} , {
+	}, {
 		.name		= "kernel",
 		.offset		= 0x030000,
-		.size		= 0x0d0000,
-	} , {
+		.size		= 0x0e0000,
+	}, {
 		.name		= "rootfs",
-		.offset		= 0x100000,
-		.size		= 0x2f0000,
-	} , {
+		.offset		= 0x110000,
+		.size		= 0x2e0000,
+	}, {
 		.name		= "art",
 		.offset		= 0x3f0000,
 		.size		= 0x010000,
 		.mask_flags	= MTD_WRITEABLE,
-	} , {
+	}, {
 		.name		= "firmware",
 		.offset		= 0x030000,
 		.size		= 0x3c0000,
@@ -63,8 +68,8 @@ static struct mtd_partition tew_632brp_partitions[] = {
 
 static struct flash_platform_data tew_632brp_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = tew_632brp_partitions,
-        .nr_parts       = ARRAY_SIZE(tew_632brp_partitions),
+	.parts		= tew_632brp_partitions,
+	.nr_parts	= ARRAY_SIZE(tew_632brp_partitions),
 #endif
 };
 
@@ -84,35 +89,48 @@ static struct gpio_led tew_632brp_leds_gpio[] __initdata = {
 	}
 };
 
-static struct gpio_button tew_632brp_gpio_buttons[] __initdata = {
+static struct gpio_keys_button tew_632brp_gpio_keys[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
-		.code		= BTN_0,
-		.threshold	= 5,
+		.code		= KEY_RESTART,
+		.debounce_interval = TEW_632BRP_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= TEW_632BRP_GPIO_BTN_RESET,
 	}, {
 		.desc		= "wps",
 		.type		= EV_KEY,
-		.code		= BTN_1,
-		.threshold	= 5,
+		.code		= KEY_WPS_BUTTON,
+		.debounce_interval = TEW_632BRP_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= TEW_632BRP_GPIO_BTN_WPS,
 	}
 };
 
+#define TEW_632BRP_LAN_PHYMASK	BIT(0)
+#define TEW_632BRP_WAN_PHYMASK	BIT(4)
+#define TEW_632BRP_MDIO_MASK	(~(TEW_632BRP_LAN_PHYMASK | \
+				   TEW_632BRP_WAN_PHYMASK))
+
 static void __init tew_632brp_setup(void)
 {
+	const char *config = (char *) KSEG1ADDR(TEW_632BRP_CONFIG_ADDR);
 	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
+	u8 mac[6];
+	u8 *wlan_mac = NULL;
+
+	if (nvram_parse_mac_addr(config, TEW_632BRP_CONFIG_SIZE,
+				"lan_mac=", mac) == 0) {
+		ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
+		ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
+		wlan_mac = mac;
+	}
 
-	ar71xx_add_device_mdio(0x0);
+	ar71xx_add_device_mdio(0, TEW_632BRP_MDIO_MASK);
 
 	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.phy_mask = TEW_632BRP_LAN_PHYMASK;
 
 	ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-	ar71xx_eth1_data.phy_mask = 0x10;
+	ar71xx_eth1_data.phy_mask = TEW_632BRP_WAN_PHYMASK;
 
 	ar71xx_add_device_eth(0);
 	ar71xx_add_device_eth(1);
@@ -122,11 +140,12 @@ static void __init tew_632brp_setup(void)
 	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(tew_632brp_leds_gpio),
 					tew_632brp_leds_gpio);
 
-	ar71xx_add_device_gpio_buttons(-1, TEW_632BRP_BUTTONS_POLL_INTERVAL,
-					ARRAY_SIZE(tew_632brp_gpio_buttons),
-					tew_632brp_gpio_buttons);
+	ar71xx_register_gpio_keys_polled(-1, TEW_632BRP_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(tew_632brp_gpio_keys),
+					 tew_632brp_gpio_keys);
 
-	ar913x_add_device_wmac(eeprom, NULL);
+	ar9xxx_add_device_wmac(eeprom, wlan_mac);
 }
 
-MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TRENDnet TEW-632BRP", tew_632brp_setup);
+MIPS_MACHINE(AR71XX_MACH_TEW_632BRP, "TEW-632BRP", "TRENDnet TEW-632BRP",
+	     tew_632brp_setup);