diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-04 18:27:09 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-04 18:27:09 +0000 |
| commit | 2bc9700c0d43b8fb0e4e3a6738e2ff8340ce78a1 (patch) | |
| tree | edeaa03713a638695377e728b0d5d246c8097ca8 /target/linux/bcm53xx | |
| parent | 5a55ace3b841895d93a6dd7f649e37f35bd2d8d3 (diff) | |
| download | upstream-2bc9700c0d43b8fb0e4e3a6738e2ff8340ce78a1.tar.gz upstream-2bc9700c0d43b8fb0e4e3a6738e2ff8340ce78a1.tar.bz2 upstream-2bc9700c0d43b8fb0e4e3a6738e2ff8340ce78a1.zip | |
bcm53xx: update the ethernet core hacks
The PHY always says there is no link
Instead of doing this dma sync a mdelay does the same trick and it is as unreliable.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39202
Diffstat (limited to 'target/linux/bcm53xx')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch index 98fd788f5b..e11a31f1f2 100644 --- a/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch +++ b/target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch @@ -1,9 +1,10 @@ -bgmac: make bgmac work on systems without nvram +These are some hackish patches to make the Ethernet driver work somehow +on this arm core. +The flash driver is not working, so we removed the nvram reading, this +should be changed after we have a flash driver. +The mdelay(1) is a ugly workaround for this arm chip, this seams to be a dma problem. -Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> ---- - drivers/net/ethernet/broadcom/bgmac.c | 4 ++++ - 1 file changed, 4 insertions(+) +The PHY says it is not connected by default, just ignore it. --- a/drivers/net/ethernet/broadcom/Kconfig +++ b/drivers/net/ethernet/broadcom/Kconfig @@ -30,7 +31,18 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> static const struct bcma_device_id bgmac_bcma_tbl[] = { BCMA_CORE(BCMA_MANUF_BCM, BCMA_CORE_4706_MAC_GBIT, BCMA_ANY_REV, BCMA_ANY_CLASS), -@@ -1445,7 +1449,7 @@ static int bgmac_probe(struct bcma_devic +@@ -165,6 +169,10 @@ static netdev_tx_t bgmac_dma_tx_add(stru + + netdev_sent_queue(net_dev, skb->len); + ++ if (bgmac->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM4707 || ++ bgmac->core->bus->chipinfo.id == BCMA_CHIP_ID_BCM53018) ++ mdelay(1); ++ + wmb(); + + /* Increase ring->end to point empty slot. We tell hardware the first +@@ -1438,7 +1446,7 @@ static int bgmac_probe(struct bcma_devic int err; /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */ @@ -39,7 +51,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> pr_err("Unsupported core_unit %d\n", core->core_unit); return -ENOTSUPP; } -@@ -1541,8 +1545,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1534,8 +1542,7 @@ static int bgmac_probe(struct bcma_devic /* TODO: reset the external phy. Specs are needed */ bgmac_phy_reset(bgmac); @@ -49,3 +61,14 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> if (bgmac->has_robosw) bgmac_warn(bgmac, "Support for Roboswitch not implemented\n"); +--- a/drivers/net/phy/phy_device.c ++++ b/drivers/net/phy/phy_device.c +@@ -814,7 +814,7 @@ int genphy_update_link(struct phy_device + return status; + + if ((status & BMSR_LSTATUS) == 0) +- phydev->link = 0; ++ phydev->link = 1; + else + phydev->link = 1; + |