diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-04 18:25:05 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-01-04 18:25:05 +0000 |
| commit | 5a55ace3b841895d93a6dd7f649e37f35bd2d8d3 (patch) | |
| tree | 031f591f1409112e1c8523e471fb79983e3e581d /target/linux/bcm53xx/patches-3.10 | |
| parent | 815ceabd9dbbae62b30edad7b9e2923d6624fdfb (diff) | |
| download | upstream-5a55ace3b841895d93a6dd7f649e37f35bd2d8d3.tar.gz upstream-5a55ace3b841895d93a6dd7f649e37f35bd2d8d3.tar.bz2 upstream-5a55ace3b841895d93a6dd7f649e37f35bd2d8d3.zip | |
kernel: bgmac: update the driver patches to a version submitted for mainline kernel.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39201
Diffstat (limited to 'target/linux/bcm53xx/patches-3.10')
| -rw-r--r-- | target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch | 14 |
1 files changed, 2 insertions, 12 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 a8e0b0bce4..98fd788f5b 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 @@ -30,7 +30,7 @@ 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), -@@ -1441,7 +1445,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1445,7 +1449,7 @@ static int bgmac_probe(struct bcma_devic int err; /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */ @@ -39,17 +39,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> pr_err("Unsupported core_unit %d\n", core->core_unit); return -ENOTSUPP; } -@@ -1476,8 +1480,7 @@ static int bgmac_probe(struct bcma_devic - } - bgmac->cmn = core->bus->drv_gmac_cmn.core; - -- bgmac->phyaddr = core->core_unit ? sprom->et1phyaddr : -- sprom->et0phyaddr; -+ bgmac->phyaddr = 30; - bgmac->phyaddr &= BGMAC_PHY_MASK; - if (bgmac->phyaddr == BGMAC_PHY_MASK) { - bgmac_err(bgmac, "No PHY found\n"); -@@ -1527,8 +1530,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1541,8 +1545,7 @@ static int bgmac_probe(struct bcma_devic /* TODO: reset the external phy. Specs are needed */ bgmac_phy_reset(bgmac); |