diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-11 00:15:00 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2013-11-11 00:15:00 +0000 |
| commit | aa790ea61fe17b63918b15a514f38552698fc703 (patch) | |
| tree | 15aba35e775103546538e49f16c26342ee4674f9 /target/linux/bcm53xx | |
| parent | 7444a626e2edd01e2bbab97d9aa78e98cc604bf4 (diff) | |
| download | upstream-aa790ea61fe17b63918b15a514f38552698fc703.tar.gz upstream-aa790ea61fe17b63918b15a514f38552698fc703.tar.bz2 upstream-aa790ea61fe17b63918b15a514f38552698fc703.zip | |
bcm53xx: make bgmac work
This makes bgmac work without sprom and refreshed the patches.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 38715
Diffstat (limited to 'target/linux/bcm53xx')
4 files changed, 42 insertions, 3 deletions
diff --git a/target/linux/bcm53xx/config-3.10 b/target/linux/bcm53xx/config-3.10 index b8ac7d3e65..1e12a9424e 100644 --- a/target/linux/bcm53xx/config-3.10 +++ b/target/linux/bcm53xx/config-3.10 @@ -12,7 +12,6 @@ CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MULTI_V7=y # CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set CONFIG_ARCH_NR_GPIO=0 -# CONFIG_ARCH_OMAP2PLUS is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SUNXI is not set diff --git a/target/linux/bcm53xx/patches-3.10/121-bcma-fix-dma-mask.patch b/target/linux/bcm53xx/patches-3.10/121-bcma-fix-dma-mask.patch index b695bc94aa..97ad0087eb 100644 --- a/target/linux/bcm53xx/patches-3.10/121-bcma-fix-dma-mask.patch +++ b/target/linux/bcm53xx/patches-3.10/121-bcma-fix-dma-mask.patch @@ -8,7 +8,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -155,6 +155,7 @@ static int bcma_register_cores(struct bc +@@ -144,6 +144,7 @@ static int bcma_register_cores(struct bc core->irq = bus->host_pci->irq; break; case BCMA_HOSTTYPE_SOC: diff --git a/target/linux/bcm53xx/patches-3.10/122-bcma-add-arm-support.patch b/target/linux/bcm53xx/patches-3.10/122-bcma-add-arm-support.patch index 1ce2013739..37b7311f74 100644 --- a/target/linux/bcm53xx/patches-3.10/122-bcma-add-arm-support.patch +++ b/target/linux/bcm53xx/patches-3.10/122-bcma-add-arm-support.patch @@ -99,7 +99,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> +} --- a/drivers/bcma/main.c +++ b/drivers/bcma/main.c -@@ -269,6 +269,13 @@ int bcma_bus_register(struct bcma_bus *b +@@ -258,6 +258,13 @@ int bcma_bus_register(struct bcma_bus *b bcma_core_mips_init(&bus->drv_mips); } 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 07ba44a53e..aae20cbeac 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 @@ -5,6 +5,17 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> drivers/net/ethernet/broadcom/bgmac.c | 4 ++++ 1 file changed, 4 insertions(+) +--- a/drivers/net/ethernet/broadcom/Kconfig ++++ b/drivers/net/ethernet/broadcom/Kconfig +@@ -132,7 +132,7 @@ config BNX2X_SRIOV + + config BGMAC + tristate "BCMA bus GBit core support" +- depends on BCMA_HOST_SOC && HAS_DMA && BCM47XX ++ depends on BCMA_HOST_SOC && HAS_DMA + select PHYLIB + ---help--- + This driver supports GBit MAC and BCM4706 GBit MAC cores on BCMA bus. --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -17,7 +17,11 @@ @@ -19,3 +30,32 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> 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 + int err; + + /* We don't support 2nd, 3rd, ... units, SPROM has to be adjusted */ +- if (core->core_unit > 1) { ++ if (core->core_unit > 0) { + pr_err("Unsupported core_unit %d\n", core->core_unit); + return -ENOTSUPP; + } +@@ -1528,8 +1532,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 = 30; + 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 + /* TODO: reset the external phy. Specs are needed */ + bgmac_phy_reset(bgmac); + +- bgmac->has_robosw = !!(core->bus->sprom.boardflags_lo & +- BGMAC_BFL_ENETROBO); ++ bgmac->has_robosw = 1; + if (bgmac->has_robosw) + bgmac_warn(bgmac, "Support for Roboswitch not implemented\n"); + |