ar71xx: don't probe the LAN PHY

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

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
index 1cfcec3..56af69d 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -145,8 +145,8 @@ static void __init ubnt_init_secondary_mac(unsigned char *mac_base)
        ar71xx_eth1_data.mac_addr[0] |= 0x02;
 }
 
-#define UBNT_RS_WAN_PHYMASK    (1 << 20)
-#define UBNT_RS_LAN_PHYMASK    ((1 << 16) | (1 << 17) | (1 << 18) | (1 << 19))
+#define UBNT_RS_WAN_PHYMASK    BIT(20)
+#define UBNT_RS_LAN_PHYMASK    (BIT(16) | BIT(17) | BIT(18) | BIT(19))
 
 static void __init ubnt_rs_setup(void)
 {
@@ -175,8 +175,8 @@ static void __init ubnt_rs_setup(void)
 MIPS_MACHINE(AR71XX_MACH_UBNT_RS, "UBNT-RS", "Ubiquiti RouterStation",
             ubnt_rs_setup);
 
-#define UBNT_RSPRO_WAN_PHYMASK (1 << 4)
-#define UBNT_RSPRO_LAN_PHYMASK ((1 << 0) | (1 << 1) | (1 << 2) | (1 << 3))
+#define UBNT_RSPRO_WAN_PHYMASK BIT(4)
+#define UBNT_RSPRO_LAN_PHYMASK (BIT(0) | BIT(1) | BIT(2) | BIT(3))
 
 static void __init ubnt_rspro_setup(void)
 {
@@ -214,7 +214,7 @@ static void __init ubnt_lsx_setup(void)
 
 MIPS_MACHINE(AR71XX_MACH_UBNT_LSX, "UBNT-LSX", "Ubiquiti LSX", ubnt_lsx_setup);
 
-#define UBNT_LSSR71_PHY_MASK   (1 << 1)
+#define UBNT_LSSR71_PHY_MASK   BIT(1)
 
 static void __init ubnt_lssr71_setup(void)
 {
@@ -235,6 +235,8 @@ static void __init ubnt_lssr71_setup(void)
 MIPS_MACHINE(AR71XX_MACH_UBNT_LSSR71, "UBNT-LS-SR71", "Ubiquiti LS-SR71",
             ubnt_lssr71_setup);
 
+#define UBNT_M_WAN_PHYMASK     BIT(4)
+
 static void __init ubnt_m_setup(void)
 {
        u8 *mac1 = (u8 *) KSEG1ADDR(0x1fff0000);
@@ -243,16 +245,14 @@ static void __init ubnt_m_setup(void)
 
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(~0);
+       ar71xx_add_device_mdio(~UBNT_M_WAN_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
        ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0);
-       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+       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.fifo_cfg1 = 0x0010ffff;
-       ar71xx_eth0_data.fifo_cfg2 = 0x015500aa;
-       ar71xx_eth0_data.fifo_cfg3 = 0x01f00140;
+       ar71xx_eth0_data.phy_mask = UBNT_M_WAN_PHYMASK;
 
        ar71xx_add_device_eth(0);
 
@@ -287,9 +287,6 @@ static void __init ubnt_nano_m_setup(void)
        ar71xx_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
-       ar71xx_eth1_data.fifo_cfg1 = 0x0010ffff;
-       ar71xx_eth1_data.fifo_cfg2 = 0x015500aa;
-       ar71xx_eth1_data.fifo_cfg3 = 0x01f00140;
 
        ar71xx_add_device_eth(1);
 }
@@ -316,12 +313,13 @@ static void __init ubnt_unifi_setup(void)
 
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(~0);
+       ar71xx_add_device_mdio(~UBNT_M_WAN_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
-       ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
+       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.phy_mask = UBNT_M_WAN_PHYMASK;
 
        ar71xx_add_device_eth(0);