backfire: ar71xx: fix firmware partition size on the MZK-W04NU board (backport of...

[openwrt/svn-archive/archive.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-pb44.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
index 34d264cc053d741035dcede963a81c1bf3700761..aa746665e373df60147fec186be316e89cf7d708 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
@@ -19,9 +19,9 @@
 #include <linux/i2c-gpio.h>
 #include <linux/i2c/pcf857x.h>
 
-#include <asm/mips_machine.h>
 #include <asm/mach-ar71xx/ar71xx.h>
 
+#include "machtype.h"
 #include "devices.h"
 #include "dev-pb42-pci.h"
 #include "dev-gpio-buttons.h"
@@ -95,14 +95,14 @@ static struct gpio_button pb44_gpio_buttons[] __initdata = {
                .desc           = "soft_reset",
                .type           = EV_KEY,
                .code           = BTN_0,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = PB44_GPIO_SW_RESET,
                .active_low     = 1,
        } , {
                .desc           = "jumpstart",
                .type           = EV_KEY,
                .code           = BTN_1,
-               .threshold      = 5,
+               .threshold      = 3,
                .gpio           = PB44_GPIO_SW_JUMP,
                .active_low     = 1,
        }
@@ -179,7 +179,6 @@ static void __init pb44_init(void)
        ar71xx_add_device_eth(0);
 
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
-       ar71xx_eth1_data.phy_mask = PB44_LAN_PHYMASK;
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
        ar71xx_eth1_pll_data.pll_1000 = 0x110000;
@@ -205,4 +204,4 @@ static void __init pb44_init(void)
                                       pb44_gpio_buttons);
 }
 
-MIPS_MACHINE(AR71XX_MACH_PB44, "Atheros PB44", pb44_init);
+MIPS_MACHINE(AR71XX_MACH_PB44, "PB44", "Atheros PB44", pb44_init);