ar71xx: add an id argument to ar71xx_add_device_mdio

SVN-Revision: 28982

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
index 80668169a9ceb7d0483ef529921cf8e2e6f4bd18..fa22c0df8b318b0fe0a9a84ee1dbcb5e7d74654b 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.c
@@ -169,8 +169,13 @@ static void ar71xx_set_pll(u32 cfg_reg, u32 pll_reg, u32 pll_val, u32 shift)
        iounmap(base);
 }
 
-void __init ar71xx_add_device_mdio(u32 phy_mask)
+void __init ar71xx_add_device_mdio(unsigned int id, u32 phy_mask)
 {
+       if (id > 0) {
+               printk(KERN_ERR "ar71xx: invalid MDIO id %u\n", id);
+               return;
+       }
+
        switch (ar71xx_soc) {
        case AR71XX_SOC_AR7240:
                ar71xx_mdio_data.is_ar7240 = 1;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
index 0a3255ff89b1058644b6f9ad96ba538cbe26d718..7a222c71398387c7c7c6f61bbdca07347257d930 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/devices.h
@@ -41,7 +41,7 @@ extern struct platform_device ar71xx_eth1_device;
 void ar71xx_add_device_eth(unsigned int id) __init;
 
 extern struct platform_device ar71xx_mdio_device;
-void ar71xx_add_device_mdio(u32 phy_mask) __init;
+void ar71xx_add_device_mdio(unsigned int id, u32 phy_mask) __init;
 
 void ar71xx_add_device_uart(void) __init;
 

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-all0258n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-all0258n.c
index 8b50a542c26a02e3e6517898e1e66facac45abed..b94d8ee821e4764946703b20dcee9f23e8001195 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-all0258n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-all0258n.c
@@ -134,7 +134,7 @@ static void __init all0258n_setup(void)
        ar71xx_eth1_data.phy_mask = ALL0258N_SEC_PHYMASK;
        ar71xx_eth1_data.has_ar7240_switch = 1;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_add_device_eth(0);
        ar71xx_add_device_eth(1);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap121.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap121.c
index 81b5eb768c852b82532485c7fc10f66bf993465c..8766f06aca8ffa35f9e9cb95f45538ac9bdc630d 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap121.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap121.c
@@ -200,7 +200,7 @@ static void __init ap121_common_setup(void)
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
        ar71xx_eth1_data.has_ar7240_switch = 1;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 

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 66c57ed308eeee706c75235c916a14f8e1a1ad42..802dbec0c1c73e9c55c20ab5ade3267ab8df26cd 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap81.c
@@ -110,7 +110,7 @@ static void __init ap81_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
index bcd2faeb5f926c18295a9b1834441d546e712df7..2eab994555e2a6a76e54aa6e04ab105025ed1bb8 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap83.c
@@ -197,7 +197,7 @@ static void __init ap83_generic_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_add_device_mdio(0xfffffffe);
+       ar71xx_add_device_mdio(0, 0xfffffffe);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap96.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap96.c
index a43631ff29d6c1f9c54b62f9fcc3f603f942f66f..5882af29f960b81dd88734f70768cf770895eb61 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap96.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ap96.c
@@ -142,7 +142,7 @@ static void __init ap96_setup(void)
 {
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
 
-       ar71xx_add_device_mdio(~(AP96_WAN_PHYMASK | AP96_LAN_PHYMASK));
+       ar71xx_add_device_mdio(0, ~(AP96_WAN_PHYMASK | AP96_LAN_PHYMASK));
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, art, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
index 96cae553408dd9dd3f94bf1e24e2a287c34219f8..e99536c91e756482621e14c24b2ae1234eab3dea 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-aw-nr580.c
@@ -78,7 +78,7 @@ static struct gpio_keys_button aw_nr580_gpio_keys[] __initdata = {
 
 static void __init aw_nr580_setup(void)
 {
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
        ar71xx_eth0_data.speed = SPEED_100;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
index 34f77dde3e03422d7016de29a27e3bc143a585ef..e503c583eb62faf03c7feaa176961679bbc2a845 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-600-a1.c
@@ -148,7 +148,7 @@ static void __init dir_600_a1_setup(void)
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
index fa1f8b9efc69d34789f240796eb7f2e969f89f58..fcadc6f06799f7eaf55fc40a01cde62741e2d94c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-615-c1.c
@@ -148,7 +148,7 @@ static void __init dir_615c1_setup(void)
                wlan_mac = mac;
        }
 
-       ar71xx_add_device_mdio(DIR_615C1_MDIO_MASK);
+       ar71xx_add_device_mdio(0, DIR_615C1_MDIO_MASK);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth0_data.phy_mask = DIR_615C1_LAN_PHYMASK;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
index 2393e60b16af8e308f3f906b8a76555c3d76558a..fe672ff46bba3af551c7465d6b0efb88b118c602 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-dir-825-b1.c
@@ -169,7 +169,7 @@ static void __init dir825b1_setup(void)
        dir825b1_read_ascii_mac(mac1, DIR825B1_MAC_LOCATION_0);
        dir825b1_read_ascii_mac(mac2, DIR825B1_MAC_LOCATION_1);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 2);
        ar71xx_eth0_data.mii_bus_dev = &dir825b1_rtl8366s_device.dev;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c
index 69e22f39a153823b7d19e45a483385c3d527f63f..230bf78ed5a30efafe597ecdba850bf0dfedbc82 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-eap7660d.c
@@ -157,7 +157,7 @@ static void __init eap7660d_setup(void)
 {
        u8 *boardconfig = (u8 *) KSEG1ADDR(EAP7660D_BOARDCONFIG);
 
-       ar71xx_add_device_mdio(~EAP7660D_PHYMASK);
+       ar71xx_add_device_mdio(0, ~EAP7660D_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr,
                        boardconfig + EAP7660D_GBIC_MAC_OFFSET, 0);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ja76pf.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ja76pf.c
index c646a27a25d1b0731a41e854ac14f24385091c76..0e21fdb58e9ebd7a7e60d8119fb72a68ea9b8dc3 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ja76pf.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ja76pf.c
@@ -73,7 +73,7 @@ static void __init ja76pf_init(void)
 {
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(~JA76PF_MDIO_PHYMASK);
+       ar71xx_add_device_mdio(0, ~JA76PF_MDIO_PHYMASK);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth0_data.phy_mask = JA76PF_LAN_PHYMASK;

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 f7215a133f81a45ec5b387451721e6e73150c4c1..d6420318717f4731a7af5f5cc0595af729a449f7 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-jwap003.c
@@ -53,7 +53,7 @@ static void __init jwap003_init(void)
 {
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth0_data.phy_mask = JWAP003_WAN_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 4954d396aba85b1916f51330970b12e6802a0445..dbb408cbb2820bdcfaa75e2e5485be004c2ef63d 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
@@ -134,7 +134,7 @@ static void __init mzk_w04nu_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_add_device_mdio(MZK_W04NU_MDIO_MASK);
+       ar71xx_add_device_mdio(0, MZK_W04NU_MDIO_MASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
        ar71xx_eth0_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 c3f2c5330c6db6d5794b3a5cb2897251d3be4e45..98b3f009263c42f737e952072b47222c1ed29963 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-mzk-w300nh.c
@@ -129,7 +129,7 @@ static void __init mzk_w300nh_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_add_device_mdio(MZK_W300NH_MDIO_MASK);
+       ar71xx_add_device_mdio(0, MZK_W300NH_MDIO_MASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-om2p.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-om2p.c
index 926e01041abff6748c8067e978a10dae03b42b0f..848fbe2b1aaaa8d38d9f1afa821af8f6d9907b74 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-om2p.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-om2p.c
@@ -93,7 +93,7 @@ static void __init om2p_setup(void)
 
        ar71xx_add_device_m25p80(&om2p_flash_data);
 
-       ar71xx_add_device_mdio(~OM2P_WAN_PHYMASK);
+       ar71xx_add_device_mdio(0, ~OM2P_WAN_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
        ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
index 118a54e99ba8efda66ec762a0764f6a00c0f6ee5..b3858545f48c661f0578a7009fdf80915ae35768 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb42.c
@@ -50,7 +50,7 @@ static void __init pb42_init(void)
 {
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(~PB42_MDIO_PHYMASK);
+       ar71xx_add_device_mdio(0, ~PB42_MDIO_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;

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 59802d4b8db3d2dfdf26906cb885cd1d99bb2264..a66be185842e0b1630296aeab2ae74fb991e796c 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb44.c
@@ -174,7 +174,7 @@ static struct platform_device pb44_spi_device = {
 
 static void __init pb44_init(void)
 {
-       ar71xx_add_device_mdio(~PB44_MDIO_PHYMASK);
+       ar71xx_add_device_mdio(0, ~PB44_MDIO_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb92.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb92.c
index e598ebc539d25979c1a20289df4ee2f656e5fcd5..4c5d3ab4a8b97465bd99233f5522524bbee587be 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb92.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-pb92.c
@@ -86,7 +86,7 @@ static void __init pb92_init(void)
 
        ar71xx_add_device_m25p80(&pb92_flash_data);
 
-       ar71xx_add_device_mdio(~BIT(0));
+       ar71xx_add_device_mdio(0, ~BIT(0));
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth0_data.speed = SPEED_1000;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c
index 88e29c080cd775acf679693c31de0c290f7197cd..1b9f96bcef4bb5a8fa270d1f89c13e40a6524241 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb4xx.c
@@ -218,7 +218,7 @@ static void __init rb411_setup(void)
        spi_register_board_info(rb4xx_microsd_info,
                                ARRAY_SIZE(rb4xx_microsd_info));
 
-       ar71xx_add_device_mdio(0xfffffffc);
+       ar71xx_add_device_mdio(0, 0xfffffffc);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
@@ -251,7 +251,7 @@ static void __init rb433_setup(void)
        spi_register_board_info(rb4xx_microsd_info,
                                ARRAY_SIZE(rb4xx_microsd_info));
 
-       ar71xx_add_device_mdio(~RB433_MDIO_PHYMASK);
+       ar71xx_add_device_mdio(0, ~RB433_MDIO_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 1);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
@@ -286,7 +286,7 @@ MIPS_MACHINE(AR71XX_MACH_RB_433U, "433U", "MikroTik RouterBOARD 433UAH",
 static void __init rb450_generic_setup(int gige)
 {
        rb4xx_generic_setup();
-       ar71xx_add_device_mdio(~RB450_MDIO_PHYMASK);
+       ar71xx_add_device_mdio(0, ~RB450_MDIO_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 1);
        ar71xx_eth0_data.phy_if_mode = (gige) ?
@@ -324,7 +324,7 @@ static void __init rb493_setup(void)
 {
        rb4xx_generic_setup();
 
-       ar71xx_add_device_mdio(0x3fffff00);
+       ar71xx_add_device_mdio(0, 0x3fffff00);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
@@ -376,7 +376,7 @@ static void __init rb493g_setup(void)
        platform_device_register(&rb4xx_spi_device);
        platform_device_register(&rb4xx_nand_device);
 
-       ar71xx_add_device_mdio(~RB493G_MDIO_PHYMASK);
+       ar71xx_add_device_mdio(0, ~RB493G_MDIO_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c
index 547ad12d3f1d007500d7ee094a4e566ac5909991..877567730ae10e2c8e0d36cd93a7580cf92ffbf0 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-rb750.c
@@ -132,7 +132,7 @@ static void __init rb750_setup(void)
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
        ar71xx_eth1_data.has_ar7240_switch = 1;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
index 7ddb9c8e2f3d30b2d75c7f40a0c081e0ebaf2f23..b7f9cb683d008c53d434ede993b2a8a4412f4315 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tew-632brp.c
@@ -124,7 +124,7 @@ static void __init tew_632brp_setup(void)
                wlan_mac = mac;
        }
 
-       ar71xx_add_device_mdio(TEW_632BRP_MDIO_MASK);
+       ar71xx_add_device_mdio(0, TEW_632BRP_MDIO_MASK);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth0_data.phy_mask = TEW_632BRP_LAN_PHYMASK;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c
index e73fec9a0203aa78396b868e66571ef6c4c52831..b4dbbb653fe1f8a911398ed1e1676703b4ab8196 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-mr3x20.c
@@ -138,7 +138,7 @@ static void __init tl_mr3x20_setup(void)
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
index 198e0bfd12aa556b96ff4adff0c2ed3215628afc..ab5d18716d7dc67722d5ff10edf0b69c8f8fbecb 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd-v2.c
@@ -110,7 +110,7 @@ static void __init tl_wa901nd_v2_setup(void)
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
        ar71xx_eth0_data.phy_mask = 0x00001000;
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_eth0_data.reset_bit = RESET_MODULE_GE0_MAC |
                                     RESET_MODULE_GE0_PHY;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
index ef30e640327f3c101915ab0d177d55d5373d7ce1..5d2d2fd9b1eaf1572a8303035c118434d2447bb6 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wa901nd.c
@@ -111,7 +111,7 @@ static void __init tl_wa901nd_setup(void)
        ar71xx_eth1_data.duplex      = DUPLEX_FULL;
        ar71xx_eth1_data.has_ar7240_switch = 1;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
 
        ar71xx_add_device_m25p80(&tl_wa901nd_flash_data);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c
index 656e7493a33d4ef07a508121495696c88060fa02..54733dbd3ba38d2c20b58ede0065ec31cc8c5746 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr703n.c
@@ -111,7 +111,7 @@ static void __init tl_wr703n_setup(void)
        ar71xx_eth0_data.duplex = DUPLEX_FULL;
        ar71xx_eth0_data.phy_mask = BIT(4);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(0);
 
        ar9xxx_add_device_wmac(ee, mac);

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd-v4.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd-v4.c
index 7e920ccd0034ac99f8a61ada81aa345cc9559556..e987afd53fa94bb2a440407a7df3085fcaba44f8 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd-v4.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd-v4.c
@@ -145,7 +145,7 @@ static void __init tl_wr741ndv4_setup(void)
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
        ar71xx_eth1_data.has_ar7240_switch = 1;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
index 76db88d644d03df06b54e453d67df2e6d6301d69..28e1fe932bc11a264bda5bf4ef60e3be132995ea 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr741nd.c
@@ -123,7 +123,7 @@ static void __init tl_wr741nd_setup(void)
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
index 4646ada1a319689474d425e52afb0db19cf8133e..c5135ecdc6da05f3945a8d371db48c9c19f984d6 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr841n.c
@@ -118,7 +118,7 @@ static void __init tl_wr841n_v1_setup(void)
 {
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
index 2a4b4539aa92416f5ba90434a043cf03bf0eea0a..2815b7d66c8df1b47b2b7714675936308e55a27b 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-tl-wr941nd.c
@@ -123,7 +123,7 @@ static void __init tl_wr941nd_setup(void)
        u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;

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 56af69dcc2cbe525268834f3d41f7a53ae93c4bf..37ce37630df611509d350757ed9e74e3a9d16027 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-ubnt.c
@@ -152,7 +152,7 @@ static void __init ubnt_rs_setup(void)
 {
        ubnt_generic_setup();
 
-       ar71xx_add_device_mdio(~(UBNT_RS_WAN_PHYMASK | UBNT_RS_LAN_PHYMASK));
+       ar71xx_add_device_mdio(0, ~(UBNT_RS_WAN_PHYMASK | UBNT_RS_LAN_PHYMASK));
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
@@ -182,7 +182,7 @@ static void __init ubnt_rspro_setup(void)
 {
        ubnt_generic_setup();
 
-       ar71xx_add_device_mdio(~(UBNT_RSPRO_WAN_PHYMASK |
+       ar71xx_add_device_mdio(0, ~(UBNT_RSPRO_WAN_PHYMASK |
                                 UBNT_RSPRO_LAN_PHYMASK));
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
@@ -220,7 +220,7 @@ static void __init ubnt_lssr71_setup(void)
 {
        ubnt_generic_setup();
 
-       ar71xx_add_device_mdio(~UBNT_LSSR71_PHY_MASK);
+       ar71xx_add_device_mdio(0, ~UBNT_LSSR71_PHY_MASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
@@ -245,7 +245,7 @@ static void __init ubnt_m_setup(void)
 
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(~UBNT_M_WAN_PHYMASK);
+       ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
        ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 0);
@@ -313,7 +313,7 @@ static void __init ubnt_unifi_setup(void)
 
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(~UBNT_M_WAN_PHYMASK);
+       ar71xx_add_device_mdio(0, ~UBNT_M_WAN_PHYMASK);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c
index 54a01d81944cd7e0253ef59a703992171c9a1913..6e2113d6f405afbf7014dc557ace931ee54a511f 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-whr-hp-g300n.c
@@ -159,7 +159,7 @@ static void __init whrhpg300n_setup(void)
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(1);
        ar71xx_add_device_eth(0);
 

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 1da20fafc470ab5d3b11c2782ba99999233d4ca1..37477eb22125351e567f5101f151a55ec8220c21 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wnr2000.c
@@ -119,7 +119,7 @@ static void __init wnr2000_setup(void)
 {
        u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff1000);
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, eeprom, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
index d85f13e55f6869de6397394615b6f73c766de0df..6a6ec1ced975369b9b158238899d68fd0c3eff20 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wp543.c
@@ -77,7 +77,7 @@ static void __init wp543_setup(void)
 {
        ar71xx_add_device_m25p80(NULL);
 
-       ar71xx_add_device_mdio(0xfffffff7);
+       ar71xx_add_device_mdio(0, 0xfffffff7);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, ar71xx_mac_base, 0);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c
index 799f9f79647d7f394885999cce56c9ccc748aeac..674550ed0b1b0ace445150b084fec6220f6ee766 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt160nl.c
@@ -127,7 +127,7 @@ static void __init wrt160nl_setup(void)
                ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac, 1);
        }
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
        ar71xx_eth0_data.phy_mask = 0x01;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
index fd0e5de0e201095ea5ce10ab0eba2b4c0d13a1ee..8bd82b983e3ee8c403ce81bcb0da5a0464dffc87 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wrt400n.c
@@ -134,7 +134,7 @@ static void __init wrt400n_setup(void)
        u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
        u8 *mac = art + WRT400N_MAC_ADDR_OFFSET;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
 
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac, 1);
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c
index ac0b9bfc0ae9ec183c9a5b36a3fb8512ed4ce1e4..c85657d7df577388aacb075ed855c8f33bf5977a 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-wzr-hp-ag300h.c
@@ -194,7 +194,7 @@ static void __init wzrhpag300h_setup(void)
        ar71xx_init_mac(ar71xx_eth0_data.mac_addr, mac1, 0);
        ar71xx_init_mac(ar71xx_eth1_data.mac_addr, mac2, 1);
 
-       ar71xx_add_device_mdio(~(BIT(0) | BIT(4)));
+       ar71xx_add_device_mdio(0, ~(BIT(0) | BIT(4)));
 
        ar71xx_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RGMII;
        ar71xx_eth0_data.speed = SPEED_1000;

diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-zcn-1523h.c b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-zcn-1523h.c
index 915340bf5cc0c0e8235e6f6232e0e65c9d11ebda..e2c247960b6e70aa0aebf822dc422b0a6acd76bc 100644 (file)
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/mach-zcn-1523h.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/mach-zcn-1523h.c
@@ -184,7 +184,7 @@ static void __init zcn_1523h_generic_setup(void)
        ar71xx_eth1_data.speed = SPEED_1000;
        ar71xx_eth1_data.duplex = DUPLEX_FULL;
 
-       ar71xx_add_device_mdio(0x0);
+       ar71xx_add_device_mdio(0, 0x0);
        ar71xx_add_device_eth(0);
 }