Add appropriate phy masks to allow the driver to register.
Signed-off-by: Jonas Gorski <[email protected]>
---
target/linux/ar71xx/config-2.6.39 | 4 ++--
.../ar71xx/files/arch/mips/ar71xx/mach-ap81.c | 2 +-
.../ar71xx/files/arch/mips/ar71xx/mach-jwap003.c | 1 -
.../ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c | 5 +++--
.../files/arch/mips/ar71xx/mach-mzk-w300nh.c | 5 +++--
.../ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c | 2 +-
6 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/target/linux/ar71xx/config-2.6.39
b/target/linux/ar71xx/config-2.6.39
index 1af1cbc..fa9aa98 100644
--- a/target/linux/ar71xx/config-2.6.39
+++ b/target/linux/ar71xx/config-2.6.39
@@ -1,5 +1,5 @@
CONFIG_AG71XX=y
-CONFIG_AG71XX_AR8216_SUPPORT=y
+# CONFIG_AG71XX_AR8216_SUPPORT is not set
# CONFIG_AG71XX_DEBUG is not set
# CONFIG_AG71XX_DEBUG_FS is not set
CONFIG_AR71XX_DEV_AP91_PCI=y
@@ -69,7 +69,7 @@ CONFIG_ATHEROS_AR71XX=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
CONFIG_CEVT_R4K=y
CONFIG_CEVT_R4K_LIB=y
-CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd"
+CONFIG_CMDLINE="rootfstype=squashfs,yaffs,jffs2 noinitrd panic=5 debug"
CONFIG_CMDLINE_BOOL=y
# CONFIG_CMDLINE_OVERRIDE is not set
CONFIG_CPU_BIG_ENDIAN=y
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
index 66c57ed..fb639e8 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
@@ -114,9 +114,9 @@ static void __init ap81_setup(void)
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 = 0x0f;
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;
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
index f7215a1..1b66d7e 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
@@ -59,7 +59,6 @@ static void __init jwap003_init(void)
ar71xx_eth0_data.phy_mask = JWAP003_WAN_PHYMASK;
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 = JWAP003_LAN_PHYMASK;
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 54dbe35..a5a5af2 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w04nu.c
@@ -127,8 +127,9 @@ static struct gpio_keys_button mzk_w04nu_gpio_keys[]
__initdata = {
}
};
+#define MZK_W04NU_LAN_PHYMASK (BIT(0) | BIT(1) | BIT(2) | BIT(3))
#define MZK_W04NU_WAN_PHYMASK BIT(4)
-#define MZK_W04NU_MDIO_MASK (~MZK_W04NU_WAN_PHYMASK)
+#define MZK_W04NU_MDIO_MASK (~(MZK_W04NU_LAN_PHYMASK |
MZK_W04NU_WAN_PHYMASK))
static void __init mzk_w04nu_setup(void)
{
@@ -138,9 +139,9 @@ static void __init mzk_w04nu_setup(void)
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 = MZK_W04NU_LAN_PHYMASK;
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;
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 27f1738..af20656 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
@@ -122,8 +122,9 @@ static struct gpio_keys_button mzk_w300nh_gpio_keys[]
__initdata = {
}
};
+#define MZK_W300NH_LAN_PHYMASK (BIT(0) | BIT(1) | BIT(2) | BIT(3))
#define MZK_W300NH_WAN_PHYMASK BIT(4)
-#define MZK_W300NH_MDIO_MASK (~MZK_W300NH_WAN_PHYMASK)
+#define MZK_W300NH_MDIO_MASK (~(MZK_W300NH_LAN_PHYMASK |
MZK_W300NH_WAN_PHYMASK))
static void __init mzk_w300nh_setup(void)
{
@@ -133,9 +134,9 @@ static void __init mzk_w300nh_setup(void)
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 = MZK_W300NH_LAN_PHYMASK;
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;
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 1da20fa..2d1b876 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
@@ -123,9 +123,9 @@ static void __init wnr2000_setup(void)
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 = 0x0f;
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;
--
1.7.2.5
_______________________________________________
openwrt-devel mailing list
[email protected]
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
