aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch')
-rw-r--r--target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch48
1 files changed, 0 insertions, 48 deletions
diff --git a/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch b/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch
deleted file mode 100644
index 754119a41c..0000000000
--- a/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch
+++ /dev/null
@@ -1,48 +0,0 @@
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -33,7 +33,6 @@
- #include <linux/skbuff.h>
- #include <linux/mii.h>
- #include <linux/phy.h>
--#include <linux/phy_fixed.h>
- #include <linux/platform_device.h>
- #include <linux/dma-mapping.h>
- #include <asm/gpio.h>
-@@ -1104,8 +1103,6 @@ static const struct net_device_ops cpmac
- .ndo_set_mac_address = eth_mac_addr,
- };
-
--static int external_switch;
--
- static int __devinit cpmac_probe(struct platform_device *pdev)
- {
- int rc, phy_id;
-@@ -1127,10 +1124,8 @@ static int __devinit cpmac_probe(struct
- }
-
- if (phy_id == PHY_MAX_ADDR) {
-- //This probably wont work as no fixed bus anymore.
-- dev_err(&pdev->dev, "no PHY present, falling back to switch mode\n");
-- strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
-- phy_id = pdev->id;
-+ dev_err(&pdev->dev, "no PHY present\n");
-+ return -ENODEV;
- }
-
- dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
-@@ -1258,14 +1253,8 @@ int __devinit cpmac_init(void)
- else
- msleep(10);
-
-- mask &= 0x7fffffff;
-- if (mask & (mask - 1)) {
-- external_switch = 1;
-- mask = 0;
-- }
--
- cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):
-- ~(mask | 0x80000001);
-+ ~(mask | 0x80000000);
- snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
-
- res = mdiobus_register(cpmac_mii);