From cbfb4a3594a465308391e132114dabee50bc2e76 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 26 Dec 2013 23:22:31 +0000 Subject: kernel: bgmac: update patches This updates the bgmac backport patch to the current upstream version and adds some more patches mostly for BCM4707. Signed-off-by: Hauke Mehrtens git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39165 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../202-bgmac-make-bgmac-work-on-systems-without-nvram.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'target/linux/bcm53xx/patches-3.10/202-bgmac-make-bgmac-work-on-systems-without-nvram.patch') 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 aae20cbeac..a8e0b0bce4 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 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), -@@ -1490,7 +1494,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1441,7 +1445,7 @@ static int bgmac_probe(struct bcma_devic int err; /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */ @@ -39,7 +39,7 @@ Signed-off-by: Hauke Mehrtens pr_err("Unsupported core_unit %d\n", core->core_unit); return -ENOTSUPP; } -@@ -1528,8 +1532,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1476,8 +1480,7 @@ static int bgmac_probe(struct bcma_devic } bgmac->cmn = core->bus->drv_gmac_cmn.core; @@ -49,7 +49,7 @@ Signed-off-by: Hauke Mehrtens bgmac->phyaddr &= BGMAC_PHY_MASK; if (bgmac->phyaddr == BGMAC_PHY_MASK) { bgmac_err(bgmac, "No PHY found\n"); -@@ -1579,8 +1582,7 @@ static int bgmac_probe(struct bcma_devic +@@ -1527,8 +1530,7 @@ static int bgmac_probe(struct bcma_devic /* TODO: reset the external phy. Specs are needed */ bgmac_phy_reset(bgmac); -- cgit v1.2.3