070-v4.6-0002-bgmac-support-Ethernet-device-on-BCM47094-SoC.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839
  1. From 9e4e6206c67ae11d68fc96882256f37c237087d4 Mon Sep 17 00:00:00 2001
  2. From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
  3. Date: Mon, 22 Feb 2016 22:51:13 +0100
  4. Subject: [PATCH] bgmac: support Ethernet device on BCM47094 SoC
  5. MIME-Version: 1.0
  6. Content-Type: text/plain; charset=UTF-8
  7. Content-Transfer-Encoding: 8bit
  8. It needs very similar workarounds to the one on BCM4707. It was tested
  9. on D-Link DIR-885L home router.
  10. Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  11. Signed-off-by: David S. Miller <davem@davemloft.net>
  12. ---
  13. drivers/net/ethernet/broadcom/bgmac.c | 6 ++++--
  14. 1 file changed, 4 insertions(+), 2 deletions(-)
  15. --- a/drivers/net/ethernet/broadcom/bgmac.c
  16. +++ b/drivers/net/ethernet/broadcom/bgmac.c
  17. @@ -30,6 +30,7 @@ static inline bool bgmac_is_bcm4707_fami
  18. {
  19. switch (bgmac->core->bus->chipinfo.id) {
  20. case BCMA_CHIP_ID_BCM4707:
  21. + case BCMA_CHIP_ID_BCM47094:
  22. case BCMA_CHIP_ID_BCM53018:
  23. return true;
  24. default:
  25. @@ -1055,8 +1056,9 @@ static void bgmac_chip_reset(struct bgma
  26. (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188))
  27. iost &= ~BGMAC_BCMA_IOST_ATTACHED;
  28. - /* 3GMAC: for BCM4707, only do core reset at bgmac_probe() */
  29. - if (ci->id != BCMA_CHIP_ID_BCM4707) {
  30. + /* 3GMAC: for BCM4707 & BCM47094, only do core reset at bgmac_probe() */
  31. + if (ci->id != BCMA_CHIP_ID_BCM4707 &&
  32. + ci->id != BCMA_CHIP_ID_BCM47094) {
  33. flags = 0;
  34. if (iost & BGMAC_BCMA_IOST_ATTACHED) {
  35. flags = BGMAC_BCMA_IOCTL_SW_CLKEN;