ar71xx: wrap long lines

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
index 251def8..f4171b0 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
@@ -38,31 +38,31 @@ static struct mtd_partition wnr2000_partitions[] = {
                .offset         = 0,
                .size           = 0x040000,
                .mask_flags     = MTD_WRITEABLE,
-       } , {
+       }, {
                .name           = "u-boot-env",
                .offset         = 0x040000,
                .size           = 0x010000,
-       } , {
+       }, {
                .name           = "rootfs",
                .offset         = 0x050000,
                .size           = 0x240000,
-       } , {
+       }, {
                .name           = "user-config",
                .offset         = 0x290000,
                .size           = 0x010000,
-       } , {
+       }, {
                .name           = "uImage",
                .offset         = 0x2a0000,
                .size           = 0x120000,
-       } , {
+       }, {
                .name           = "language_table",
                .offset         = 0x3c0000,
                .size           = 0x020000,
-       } , {
+       }, {
                .name           = "rootfs_checksum",
                .offset         = 0x3e0000,
                .size           = 0x010000,
-       } , {
+       }, {
                .name           = "art",
                .offset         = 0x3f0000,
                .size           = 0x010000,
@@ -73,8 +73,8 @@ static struct mtd_partition wnr2000_partitions[] = {
 
 static struct flash_platform_data wnr2000_flash_data = {
 #ifdef CONFIG_MTD_PARTITIONS
-        .parts          = wnr2000_partitions,
-        .nr_parts       = ARRAY_SIZE(wnr2000_partitions),
+       .parts          = wnr2000_partitions,
+       .nr_parts       = ARRAY_SIZE(wnr2000_partitions),
 #endif
 };
 
@@ -102,31 +102,31 @@ static struct gpio_button wnr2000_gpio_buttons[] __initdata = {
        {
                .desc           = "reset",
                .type           = EV_KEY,
-               .code           = BTN_0,
-               .threshold      = 5,
+               .code           = KEY_RESTART,
+               .threshold      = 3,
                .gpio           = WNR2000_GPIO_BTN_RESET,
        }, {
                .desc           = "wps",
                .type           = EV_KEY,
-               .code           = BTN_1,
-               .threshold      = 5,
+               .code           = KEY_WPS_BUTTON,
+               .threshold      = 3,
                .gpio           = WNR2000_GPIO_BTN_WPS,
        }
 };
 
 static void __init wnr2000_setup(void)
 {
-       u8 *mac = (u8 *) KSEG1ADDR(0x1fff1000);
+       u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_set_mac_base(mac);
        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;
 
@@ -143,7 +143,7 @@ static void __init wnr2000_setup(void)
                                        wnr2000_gpio_buttons);
 
 
-       ar913x_add_device_wmac();
+       ar913x_add_device_wmac(eeprom, NULL);
 }
 
-MIPS_MACHINE(AR71XX_MACH_WNR2000, "NETGEAR WNR2000", wnr2000_setup);
+MIPS_MACHINE(AR71XX_MACH_WNR2000, "WNR2000", "NETGEAR WNR2000", wnr2000_setup);