X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/a81752b1123ebfdf38991d2ec00b6840c6254393..5d6fe3e144b517ecf98b6d1caa8f6792615edb83:/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch

diff --git a/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch b/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
index 941d8889c..d11415b1a 100644
--- a/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
+++ b/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
@@ -1,88 +1,126 @@
---- a/drivers/net/cpmac.c
-+++ b/drivers/net/cpmac.c
-@@ -33,6 +33,7 @@
- #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>
-@@ -217,6 +218,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)
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -46,7 +46,6 @@ struct plat_vlynq_data {
+ 	int reset_bit;
+ };
+ 
+-
+ static int vlynq_on(struct vlynq_device *dev)
  {
- 	int i;
-@@ -1111,9 +1118,13 @@ static int __devinit cpmac_probe(struct
- 	struct cpmac_priv *priv;
- 	struct net_device *dev;
- 	struct plat_cpmac_data *pdata;
-+	void __iomem *mii_reg;
-+	u32 tmp;
-+	unsigned external_mii = 0;
+ 	int result;
+@@ -72,7 +71,8 @@ static int vlynq_on(struct vlynq_device
  
- 	pdata = pdev->dev.platform_data;
+ 	msleep(50);
+ 
+-	gpio_set_value(pdata->gpio_bit, 1);
++	gpio_set_value(pdata->gpio_bit,
++			__vlynq_rev_reg(dev->local) < 0x00010205);
+ 	msleep(50);
  
-+detect_again:
- 	for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
- 		if (!(pdata->phy_mask & (1 << phy_id)))
- 			continue;
-@@ -1122,12 +1133,43 @@ static int __devinit cpmac_probe(struct
- 		strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
- 		break;
+ 	return 0;
+@@ -601,6 +601,18 @@ static inline unsigned char char2hex(cha
  	}
--	
--	if (phy_id == PHY_MAX_ADDR) {
--		dev_err(&pdev->dev, "no PHY present\n");
--		return -ENODEV;
-+
-+	if (phy_id < PHY_MAX_ADDR && !external_mii)
-+		goto dev_alloc;
+ }
+ 
++static void auto_mdix_on(void)
++{
++	ar7_gpio_enable(28);
++	ar7_gpio_disable(30);
++}
 +
-+	/* Now disable EPHY and enable MII */
-+	dev_info(&pdev->dev, "trying external MII\n");
-+	ar7_device_disable(AR7_RESET_BIT_EPHY);
++/*static void auto_mdix_off(void)
++{
++	ar7_gpio_disable(28);
++	ar7_gpio_disable(30);
++}*/
 +
-+	mii_reg = ioremap(AR7_REGS_MII, 4);
-+	if (!mii_reg) {
-+		dev_err(&pdev->dev, "failed to iorenamp MII_SEL\n");
-+		return -ENOMEM;
+ static void cpmac_get_mac(int instance, unsigned char *dev_addr)
+ {
+ 	int i;
+@@ -662,6 +674,7 @@ static int __init ar7_register_devices(v
+ 	u16 chip_id;
+ 	int res;
+ 	u32 *bootcr, val;
++	void __iomem *mii_reg;
+ #ifdef CONFIG_SERIAL_8250
+ 	static struct uart_port uart_port[2];
+ 
+@@ -715,27 +728,6 @@ static int __init ar7_register_devices(v
+ 			return res;
  	}
  
-+	tmp = readl(mii_reg);
-+	tmp |= 1;
-+	writel(tmp, mii_reg);
-+	external_mii++;
+-	if (ar7_has_high_cpmac()) {
+-		res = fixed_phy_add(PHY_POLL, ar7_is_titan() ? cpmac_high_titan.id : cpmac_high.id,
+-						&fixed_phy_status);
+-		if (res && res != -ENODEV)
+-			return res;
+-
+-		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 :
+-						&cpmac_high);
+-
+-		if (res)
+-			return res;
+-	} else {
+-		if (ar7_is_titan())
+-			cpmac_low_data_titan.phy_mask = 0xffffffff;
+-		else
+-			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 && res != -ENODEV)
+@@ -748,6 +740,34 @@ static int __init ar7_register_devices(v
+ 	if (res)
+ 		return res;
+ 
++	if (ar7_has_high_cpmac()) {
++		res = fixed_phy_add(PHY_POLL, ar7_is_titan() ?
++				cpmac_high_titan.id : cpmac_high.id,
++				&fixed_phy_status);
++		if (res && res != -ENODEV)
++			return res;
 +
-+	if (external_mii == 1)
-+		goto detect_again;
++		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 : &cpmac_high);
 +
-+	if (phy_id < PHY_MAX_ADDR)
-+		goto dev_alloc;
++		if (res)
++			return res;
++	} else {
++		mii_reg = ioremap(AR7_REGS_MII, 4);
++		if (mii_reg) {
++			writel(readl(mii_reg) | 1, mii_reg);
++			iounmap(mii_reg);
++		}
 +
-+	/* 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;
++		ar7_gpio_disable(17);
++		mdelay(20);
++		ar7_gpio_enable(17);
++		auto_mdix_on();
 +	}
 +
-+	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);
+ 	detect_leds();
+ 	res = platform_device_register(&ar7_gpio_leds);
+ 	if (res)
+@@ -771,8 +791,10 @@ static int __init ar7_register_devices(v
+ 	ar7_wdt_res.end = ar7_wdt_res.start + 0x20;
  
- 	if (!dev) {
+ 	bootcr = (u32 *)ioremap_nocache(AR7_REGS_DCL, 4);
+-	val = *bootcr;
+-	iounmap(bootcr);
++	if (bootcr) {
++		val = *bootcr;
++		iounmap(bootcr);
++	}
+ 
+ 	/* Register watchdog only if enabled in hardware */
+ 	if (val & AR7_WDT_HW_ENA)
 --- a/arch/mips/include/asm/mach-ar7/ar7.h
 +++ b/arch/mips/include/asm/mach-ar7/ar7.h
 @@ -41,6 +41,7 @@
@@ -93,3 +131,110 @@
  #define AR7_REGS_VLYNQ1	(AR7_REGS_BASE + 0x1c00)
  #define AR7_REGS_MDIO	(AR7_REGS_BASE + 0x1e00)
  #define AR7_REGS_IRQ	(AR7_REGS_BASE + 0x2400)
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -668,9 +668,8 @@ static void cpmac_hw_start(struct net_de
+ 	for (i = 0; i < 8; i++)
+ 		cpmac_write(priv->regs, CPMAC_MAC_ADDR_LO(i), dev->dev_addr[5]);
+ 	cpmac_write(priv->regs, CPMAC_MAC_ADDR_MID, dev->dev_addr[4]);
+-	cpmac_write(priv->regs, CPMAC_MAC_ADDR_HI, dev->dev_addr[0] |
+-		    (dev->dev_addr[1] << 8) | (dev->dev_addr[2] << 16) |
+-		    (dev->dev_addr[3] << 24));
++	cpmac_write(priv->regs, CPMAC_MAC_ADDR_HI, be32_to_cpu(*(u32 *)
++			dev->dev_addr));
+ 	cpmac_write(priv->regs, CPMAC_MAX_LENGTH, CPMAC_SKB_SIZE);
+ 	cpmac_write(priv->regs, CPMAC_UNICAST_CLEAR, 0xff);
+ 	cpmac_write(priv->regs, CPMAC_RX_INT_CLEAR, 0xff);
+@@ -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;
+@@ -1117,24 +1114,26 @@ static int __devinit cpmac_probe(struct
+ 
+ 	pdata = pdev->dev.platform_data;
+ 
+-	if (external_switch || dumb_switch) {
+-		strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
+-		phy_id = pdev->id;
+-	} else {
+-		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 (dumb_switch)
++		phy_id = PHY_MAX_ADDR;
++	else for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
++		if (!((pdata->phy_mask | cpmac_mii->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) {
+ 		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;
++	} else {
++		/* Now disable EPHY and enable MII */
++		dev_info(&pdev->dev, "trying external MII\n");
++		ar7_device_disable(AR7_RESET_BIT_EPHY);
+ 	}
+ 
+ 	dev = alloc_etherdev_mq(sizeof(*priv), CPMAC_QUEUES);
+@@ -1168,7 +1167,7 @@ static int __devinit cpmac_probe(struct
+ 	priv->dev = dev;
+ 	priv->ring_size = 64;
+ 	priv->msg_enable = netif_msg_init(debug_level, 0xff);
+-	memcpy(dev->dev_addr, pdata->dev_addr, sizeof(dev->dev_addr));
++	memcpy(dev->dev_addr, pdata->dev_addr, sizeof(pdata->dev_addr));
+ 
+ 	snprintf(priv->phy_name, MII_BUS_ID_SIZE, PHY_ID_FMT, mdio_bus_id, phy_id);
+ 
+@@ -1244,14 +1243,14 @@ int __devinit cpmac_init(void)
+ 	ar7_gpio_disable(26);
+ 	ar7_gpio_disable(27);
+ 
+-	if (!ar7_is_titan()) {
++	if (ar7_is_titan()) {
++		ar7_device_reset(AR7_RESET_BIT_EPHY);
++		ar7_device_reset(TITAN_RESET_BIT_EPHY1);
++	} else {
+ 		ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
+ 		ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
+-	}
+-	ar7_device_reset(AR7_RESET_BIT_EPHY);
+ 
+-	if (ar7_is_titan()) {
+-		ar7_device_reset(TITAN_RESET_BIT_EPHY1);
++		ar7_device_reset(AR7_RESET_BIT_EPHY);
+ 	}
+ 
+ 	cpmac_mii->reset(cpmac_mii);
+@@ -1262,14 +1261,7 @@ 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 | 0x80000000);
++	cpmac_mii->phy_mask = ~mask;
+ 	snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
+ 
+ 	res = mdiobus_register(cpmac_mii);