aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-3.18
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-02-26 07:10:16 +0000
committerRafał Miłecki <zajec5@gmail.com>2016-02-26 07:10:16 +0000
commit268c966d9141db4bee8e4b9cbb71e83c09768117 (patch)
treef33459e6119e5f56ed2d2390f3a4669051b30569 /target/linux/bcm53xx/patches-3.18
parent4c8167b640be381720cb2af2ddcfac20cb3ad00e (diff)
downloadupstream-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/bcm53xx/patches-3.18')
-rw-r--r--target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch b/target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch
index 6be75bb806..36894fec24 100644
--- a/target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch
+++ b/target/linux/bcm53xx/patches-3.18/700-bgmac-add-support-for-the-3rd-bus-core-device.patch
@@ -17,7 +17,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
-@@ -1561,11 +1561,20 @@ static int bgmac_probe(struct bcma_devic
+@@ -1566,11 +1566,20 @@ static int bgmac_probe(struct bcma_devic
struct net_device *net_dev;
struct bgmac *bgmac;
struct ssb_sprom *sprom = &core->bus->sprom;
@@ -41,7 +41,7 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
pr_err("Unsupported core_unit %d\n", core->core_unit);
return -ENOTSUPP;
}
-@@ -1600,8 +1609,17 @@ static int bgmac_probe(struct bcma_devic
+@@ -1605,8 +1614,17 @@ static int bgmac_probe(struct bcma_devic
}
bgmac->cmn = core->bus->drv_gmac_cmn.core;