X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Farch%2Fmips%2Far71xx%2Fmach-mzk-w300nh.c;h=98b3f009263c42f737e952072b47222c1ed29963;hb=11a837ce029534fc38f6deb2a2f31d80fe5a1f7f;hp=6fb2312a236025213ea4df78de6d06122265c37a;hpb=e1b44378beea16bce00c3bda5d94fd13358a4c15;p=openwrt.git

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
index 6fb2312a23..98b3f00926 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
@@ -17,7 +17,7 @@
 #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"
 
@@ -31,7 +31,8 @@
 #define MZK_W300NH_GPIO_BTN_WPS		12
 #define MZK_W300NH_GPIO_BTN_RESET	21
 
-#define MZK_W04NU_BUTTONS_POLL_INTERVAL	20
+#define MZK_W300NH_KEYS_POLL_INTERVAL	20	/* msecs */
+#define MZK_W300NH_KEYS_DEBOUNCE_INTERVAL (3 * MZK_W300NH_KEYS_POLL_INTERVAL)
 
 #ifdef CONFIG_MTD_PARTITIONS
 static struct mtd_partition mzk_w300nh_partitions[] = {
@@ -40,86 +41,82 @@ static struct mtd_partition mzk_w300nh_partitions[] = {
 		.offset		= 0,
 		.size		= 0x040000,
 		.mask_flags	= MTD_WRITEABLE,
-	} , {
+	}, {
 		.name		= "u-boot-env",
 		.offset		= 0x040000,
 		.size		= 0x010000,
-	} , {
+	}, {
 		.name		= "kernel",
 		.offset		= 0x050000,
 		.size		= 0x160000,
-	} , {
+	}, {
 		.name		= "rootfs",
 		.offset		= 0x1b0000,
-		.size		= 0x610000,
-	} , {
-		.name		= "config",
-		.offset		= 0x7c0000,
-		.size		= 0x020000,
-	} , {
+		.size		= 0x630000,
+	}, {
 		.name		= "art",
 		.offset		= 0x7e0000,
 		.size		= 0x020000,
 		.mask_flags	= MTD_WRITEABLE,
-	} , {
+	}, {
 		.name		= "firmware",
 		.offset		= 0x050000,
-		.size		= 0x770000,
+		.size		= 0x790000,
 	}
 };
 #endif /* CONFIG_MTD_PARTITIONS */
 
 static struct flash_platform_data mzk_w300nh_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = mzk_w300nh_partitions,
-        .nr_parts       = ARRAY_SIZE(mzk_w300nh_partitions),
+	.parts		= mzk_w300nh_partitions,
+	.nr_parts	= ARRAY_SIZE(mzk_w300nh_partitions),
 #endif
 };
 
 static struct gpio_led mzk_w300nh_leds_gpio[] __initdata = {
 	{
-		.name		= "mzk-w300nh:green:status",
+		.name		= "planex:green:status",
 		.gpio		= MZK_W300NH_GPIO_LED_STATUS,
 		.active_low	= 1,
 	}, {
-		.name		= "mzk-w300nh:blue:wps",
+		.name		= "planex:blue:wps",
 		.gpio		= MZK_W300NH_GPIO_LED_WPS,
 		.active_low	= 1,
 	}, {
-		.name		= "mzk-w300nh:green:wlan",
+		.name		= "planex:green:wlan",
 		.gpio		= MZK_W300NH_GPIO_LED_WLAN,
 		.active_low	= 1,
 	}, {
-		.name		= "mzk-w300nh:green:ap",
+		.name		= "planex:green:ap",
 		.gpio		= MZK_W300NH_GPIO_LED_AP,
 		.active_low	= 1,
 	}, {
-		.name		= "mzk-w300nh:green:router",
+		.name		= "planex:green:router",
 		.gpio		= MZK_W300NH_GPIO_LED_ROUTER,
 		.active_low	= 1,
 	}
 };
 
-static struct gpio_button mzk_w300nh_gpio_buttons[] __initdata = {
+static struct gpio_keys_button mzk_w300nh_gpio_keys[] __initdata = {
 	{
 		.desc		= "reset",
 		.type		= EV_KEY,
 		.code		= KEY_RESTART,
-		.threshold	= 3,
+		.debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= MZK_W300NH_GPIO_BTN_RESET,
 		.active_low	= 1,
 	}, {
 		.desc		= "wps",
 		.type		= EV_KEY,
 		.code		= KEY_WPS_BUTTON,
-		.threshold	= 3,
+		.debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= MZK_W300NH_GPIO_BTN_WPS,
 		.active_low	= 1,
 	}, {
 		.desc		= "aprouter",
 		.type		= EV_KEY,
 		.code		= BTN_2,
-		.threshold	= 3,
+		.debounce_interval = MZK_W300NH_KEYS_DEBOUNCE_INTERVAL,
 		.gpio		= MZK_W300NH_GPIO_BTN_APROUTER,
 		.active_low	= 0,
 	}
@@ -132,15 +129,15 @@ static void __init mzk_w300nh_setup(void)
 {
 	u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-	ar71xx_set_mac_base(eeprom);
-
-	ar71xx_add_device_mdio(MZK_W300NH_MDIO_MASK);
+	ar71xx_add_device_mdio(0, MZK_W300NH_MDIO_MASK);
 
+	ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
 	ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
 	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 = MZK_W300NH_WAN_PHYMASK;
 
@@ -150,12 +147,12 @@ static void __init mzk_w300nh_setup(void)
 	ar71xx_add_device_m25p80(&mzk_w300nh_flash_data);
 
 	ar71xx_add_device_leds_gpio(-1, ARRAY_SIZE(mzk_w300nh_leds_gpio),
-				    mzk_w300nh_leds_gpio);
+					mzk_w300nh_leds_gpio);
 
-	ar71xx_add_device_gpio_buttons(-1, MZK_W04NU_BUTTONS_POLL_INTERVAL,
-				       ARRAY_SIZE(mzk_w300nh_gpio_buttons),
-				       mzk_w300nh_gpio_buttons);
-	ar913x_add_device_wmac(eeprom, NULL);
+	ar71xx_register_gpio_keys_polled(-1, MZK_W300NH_KEYS_POLL_INTERVAL,
+					 ARRAY_SIZE(mzk_w300nh_gpio_keys),
+					 mzk_w300nh_gpio_keys);
+	ar9xxx_add_device_wmac(eeprom, NULL);
 }
 
 MIPS_MACHINE(AR71XX_MACH_MZK_W300NH, "MZK-W300NH", "Planex MZK-W300NH",