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

[openwrt-10.03/.git] / target / linux / ar71xx / files / arch / mips / ar71xx / mach-mzk-w04nu.c

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
index 1e5a9338155d199cb8ac58650aaa097db0318b30..63fbeb855987ae45d06126f9280601da7cf6f85c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
@@ -61,7 +61,7 @@ static struct mtd_partition mzk_w04nu_partitions[] = {
        } , {
                .name           = "firmware",
                .offset         = 0x050000,
-               .size           = 0x770000,
+               .size           = 0x790000,
        }
 };
 #endif /* CONFIG_MTD_PARTITIONS */
@@ -126,22 +126,24 @@ static struct gpio_button mzk_w04nu_gpio_buttons[] __initdata = {
        }
 };
 
+#define MZK_W04NU_WAN_PHYMASK  BIT(4)
+#define MZK_W04NU_MDIO_MASK    (~MZK_W04NU_WAN_PHYMASK)
+
 static void __init mzk_w04nu_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
        ar71xx_set_mac_base(eeprom);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(MZK_W04NU_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.has_ar8216 = 1;
 
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
-       ar71xx_eth1_data.phy_mask = 0x10;
+       ar71xx_eth1_data.phy_mask = MZK_W04NU_WAN_PHYMASK;
 
        ar71xx_add_device_eth(0);
        ar71xx_add_device_eth(1);