diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-02-26 07:10:16 +0000 |
|---|---|---|
| committer | Rafał Miłecki <zajec5@gmail.com> | 2016-02-26 07:10:16 +0000 |
| commit | 268c966d9141db4bee8e4b9cbb71e83c09768117 (patch) | |
| tree | f33459e6119e5f56ed2d2390f3a4669051b30569 /target/linux/generic/patches-3.18/773-bgmac-add-srab-switch.patch | |
| parent | 4c8167b640be381720cb2af2ddcfac20cb3ad00e (diff) | |
| download | upstream-268c966d9141db4bee8e4b9cbb71e83c09768117.tar.gz upstream-268c966d9141db4bee8e4b9cbb71e83c09768117.tar.bz2 upstream-268c966d9141db4bee8e4b9cbb71e83c09768117.zip | |
kernel: support bgmac on BCM47094
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Backport of r48564 and r48756
git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@48790 3c298f89-4303-0410-b956-a3cf2f4a3e73
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 | 10 |
1 files changed, 4 insertions, 6 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 b883d73af3..559731300b 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 @@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> #include <bcm47xx_nvram.h> static const struct bcma_device_id bgmac_bcma_tbl[] = { -@@ -1538,6 +1539,17 @@ static void bgmac_mii_unregister(struct +@@ -1544,6 +1545,17 @@ static void bgmac_mii_unregister(struct mdiobus_free(mii_bus); } @@ -30,13 +30,11 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> /************************************************** * BCMA bus ops **************************************************/ -@@ -1664,6 +1676,16 @@ static int bgmac_probe(struct bcma_devic +@@ -1668,6 +1680,14 @@ static int bgmac_probe(struct bcma_devic net_dev->hw_features = net_dev->features; net_dev->vlan_features = net_dev->features; -+ if ((ci->id == BCMA_CHIP_ID_BCM4707 || -+ ci->id == BCMA_CHIP_ID_BCM53018) && -+ !bgmac_b53_pdata.regs) { ++ if (bgmac_is_bcm4707_family(bgmac) && !bgmac_b53_pdata.regs) { + bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000); + + err = platform_device_register(&bgmac_b53_dev); @@ -47,7 +45,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"); -@@ -1690,6 +1712,10 @@ static void bgmac_remove(struct bcma_dev +@@ -1694,6 +1714,10 @@ static void bgmac_remove(struct bcma_dev { struct bgmac *bgmac = bcma_get_drvdata(core); |