From f5d3d0e7d8372eb90f8e7db528b9e220fab56347 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 17 Apr 2011 18:39:38 +0000 Subject: ar7: remove patches/configs for old kernel versions SVN-Revision: 26707 --- .../ar7/patches-2.6.35/972-cpmac_multi_probe.patch | 65 ---------------------- 1 file changed, 65 deletions(-) delete mode 100644 target/linux/ar7/patches-2.6.35/972-cpmac_multi_probe.patch (limited to 'target/linux/ar7/patches-2.6.35/972-cpmac_multi_probe.patch') diff --git a/target/linux/ar7/patches-2.6.35/972-cpmac_multi_probe.patch b/target/linux/ar7/patches-2.6.35/972-cpmac_multi_probe.patch deleted file mode 100644 index 7ee604a769..0000000000 --- a/target/linux/ar7/patches-2.6.35/972-cpmac_multi_probe.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/drivers/net/cpmac.c -+++ b/drivers/net/cpmac.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -219,6 +220,12 @@ static void cpmac_hw_stop(struct net_dev - static int cpmac_stop(struct net_device *dev); - static int cpmac_open(struct net_device *dev); - -+static struct fixed_phy_status fixed_phy_status = { -+ .link = 1, -+ .speed = 100, -+ .duplex = 1, -+}; -+ - static void cpmac_dump_regs(struct net_device *dev) - { - int i; -@@ -1127,11 +1134,38 @@ static int __devinit cpmac_probe(struct - break; - } - -- if (phy_id == PHY_MAX_ADDR) { -- dev_err(&pdev->dev, "no PHY present\n"); -- return -ENODEV; -+ if (phy_id < PHY_MAX_ADDR) -+ goto dev_alloc; -+ -+ dev_info(&pdev->dev, "trying external MII\n"); -+ /* Now disable EPHY and enable MII */ -+ ar7_device_disable(AR7_RESET_BIT_EPHY); -+ *(unsigned long*) ioremap(0x08611A08, 4) |= 0x00000001; -+ -+ for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) { -+ if (!(pdata->phy_mask & (1 << phy_id))) -+ continue; -+ if (!cpmac_mii->phy_map[phy_id]) -+ continue; -+ strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE); -+ break; - } - -+ if (phy_id < PHY_MAX_ADDR) -+ goto dev_alloc; -+ -+ /* This still does not work, so now we register a fixed phy */ -+ dev_info(&pdev->dev, "using fixed PHY\n"); -+ rc = fixed_phy_add(PHY_POLL, pdev->id, &fixed_phy_status); -+ if (rc && rc != -ENODEV) { -+ dev_err(&pdev->dev, "unable to register fixed PHY\n"); -+ return rc; -+ } -+ -+ strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */ -+ phy_id = pdev->id; -+ -+dev_alloc: - dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES); - - if (!dev) { -- cgit v1.2.3