diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 18:11:22 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2015-02-11 18:11:22 +0000 |
| commit | 1f3cdb86343af98e662553dce048789baae26ba0 (patch) | |
| tree | 129c997ac1598bb70e1820850189c782f691834c /target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | |
| parent | e73ca898ab11cc58084f8359fe3858d685505c65 (diff) | |
| download | master-31e0f0ae-1f3cdb86343af98e662553dce048789baae26ba0.tar.gz master-31e0f0ae-1f3cdb86343af98e662553dce048789baae26ba0.tar.bz2 master-31e0f0ae-1f3cdb86343af98e662553dce048789baae26ba0.zip | |
kernel: fix bgmac check for chip ID
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
SVN-Revision: 44411
Diffstat (limited to 'target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch index bf3ab93830..ef12cac9bf 100644 --- a/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch @@ -30,12 +30,12 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /************************************************** * BCMA bus ops **************************************************/ -@@ -1523,6 +1535,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1524,6 +1536,16 @@ static int bgmac_probe(struct bcma_devic goto err_dma_free; } -+ if (core->id.id != BCMA_CHIP_ID_BCM4707 && -+ core->id.id != BCMA_CHIP_ID_BCM53018 && ++ if ((ci->id == BCMA_CHIP_ID_BCM4707 || ++ ci->id == BCMA_CHIP_ID_BCM53018) && + !bgmac_b53_pdata.regs) { + bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000); + @@ -47,7 +47,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> err = register_netdev(bgmac->net_dev); if (err) { bgmac_err(bgmac, "Cannot register net device\n"); -@@ -1549,6 +1571,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1550,6 +1572,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); |