diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-04 22:55:23 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-04 22:55:23 +0000 |
| commit | f491623c3771b47fca0a53bd5776730bea741890 (patch) | |
| tree | 7b7126431f22ab9feaae8ce3ed57fc8d43e87c3b /target/linux/bcm53xx | |
| parent | 7ae5ff92aeac2ed17f0d5fc9d1554f8eaa3a4d27 (diff) | |
| download | upstream-f491623c3771b47fca0a53bd5776730bea741890.tar.gz upstream-f491623c3771b47fca0a53bd5776730bea741890.tar.bz2 upstream-f491623c3771b47fca0a53bd5776730bea741890.zip | |
kernel: bgmac: update bgmac to a version from kernel 3.14-rc1
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 39465
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 | 12 |
1 files changed, 11 insertions, 1 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 73bffe59a3..78154707e7 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 @@ -40,7 +40,17 @@ The PHY says it is not connected by default, just ignore it. pr_err("Unsupported core_unit %d\n", core->core_unit); return -ENOTSUPP; } -@@ -1534,8 +1538,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1473,8 +1477,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 = BGMAC_PHY_NOREGS; // core->core_unit ? sprom->et1phyaddr : sprom->et0phyaddr; + bgmac->phyaddr &= BGMAC_PHY_MASK; + if (bgmac->phyaddr == BGMAC_PHY_MASK) { + bgmac_err(bgmac, "No PHY found\n"); +@@ -1526,8 +1529,7 @@ static int bgmac_probe(struct bcma_devic /* TODO: reset the external phy. Specs are needed */ bgmac_phy_reset(bgmac); |