summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.35/970-remove_fixed_phy.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ar7/patches-2.6.35/970-remove_fixed_phy.patch')
-rw-r--r--target/linux/ar7/patches-2.6.35/970-remove_fixed_phy.patch78
1 files changed, 0 insertions, 78 deletions
diff --git a/target/linux/ar7/patches-2.6.35/970-remove_fixed_phy.patch b/target/linux/ar7/patches-2.6.35/970-remove_fixed_phy.patch
deleted file mode 100644
index c8a00dfbc..000000000
--- a/target/linux/ar7/patches-2.6.35/970-remove_fixed_phy.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- a/arch/mips/ar7/platform.c
-+++ b/arch/mips/ar7/platform.c
-@@ -33,7 +33,6 @@
- #include <linux/string.h>
- #include <linux/etherdevice.h>
- #include <linux/phy.h>
--#include <linux/phy_fixed.h>
- #include <linux/gpio.h>
- #include <linux/clk.h>
-
-@@ -370,12 +369,6 @@ static struct resource cpmac_high_res_ti
- },
- };
-
--static struct fixed_phy_status fixed_phy_status __initdata = {
-- .link = 1,
-- .speed = 100,
-- .duplex = 1,
--};
--
- static struct plat_cpmac_data cpmac_low_data = {
- .reset_bit = 17,
- .power_bit = 20,
-@@ -769,16 +762,13 @@ static int __init ar7_register_devices(v
- }
-
- if (ar7_has_high_cpmac()) {
-- fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
-- &fixed_phy_status);
-- if (!res) {
-- cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
-+ cpmac_get_mac(1, ar7_is_titan() ? cpmac_high_data_titan.dev_addr :
- cpmac_high_data.dev_addr);
-- res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
-+ res = platform_device_register(ar7_is_titan() ? &cpmac_high_titan :
- &cpmac_high);
-- if (res)
-- pr_warning("unable to register cpmac-high: %d\n", res);
-- } else
-+ if (res)
-+ pr_warning("unable to register cpmac-high: %d\n", res);
-+ else
- pr_warning("unable to add cpmac-high phy: %d\n", res);
- } else {
- if (ar7_is_titan())
-@@ -787,16 +777,13 @@ static int __init ar7_register_devices(v
- cpmac_low_data.phy_mask = 0xffffffff;
- }
-
-- res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_low_titan.id : cpmac_low.id,
-- &fixed_phy_status);
-- if (!res) {
-- cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
-+ cpmac_get_mac(0, ar7_is_titan() ? cpmac_low_data_titan.dev_addr :
- cpmac_low_data.dev_addr);
-- res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
-+ res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
- &cpmac_low);
-- if (res)
-- pr_warning("unable to register cpmac-low: %d\n", res);
-- } else
-+ if (res)
-+ pr_warning("unable to register cpmac-low: %d\n", res);
-+ else
- pr_warning("unable to add cpmac-low phy: %d\n", res);
-
- detect_leds();
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -1273,7 +1273,7 @@ int __devinit cpmac_init(void)
- }
-
- cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
-- ~(mask | 0x80000000);
-+ ~(mask | 0x80000001);
- snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
-
- res = mdiobus_register(cpmac_mii);