773-bgmac-add-srab-switch.patch 3.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798
  1. From 3cb240533ab787899dc7f17aa7d6c5b4810e2e58 Mon Sep 17 00:00:00 2001
  2. From: Hauke Mehrtens <[email protected]>
  3. Date: Fri, 7 Jul 2017 17:26:01 +0200
  4. Subject: bcm53xx: bgmac: use srab switch driver
  5. use the srab switch driver on these SoCs.
  6. Signed-off-by: Hauke Mehrtens <[email protected]>
  7. ---
  8. drivers/net/ethernet/broadcom/bgmac-bcma.c | 1 +
  9. drivers/net/ethernet/broadcom/bgmac.c | 24 ++++++++++++++++++++++++
  10. drivers/net/ethernet/broadcom/bgmac.h | 4 ++++
  11. 3 files changed, 29 insertions(+)
  12. --- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
  13. +++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
  14. @@ -243,6 +243,7 @@ static int bgmac_probe(struct bcma_devic
  15. bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
  16. bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
  17. bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
  18. + bgmac->feature_flags |= BGMAC_FEAT_SRAB;
  19. break;
  20. case BCMA_CHIP_ID_BCM53573:
  21. bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
  22. --- a/drivers/net/ethernet/broadcom/bgmac.c
  23. +++ b/drivers/net/ethernet/broadcom/bgmac.c
  24. @@ -11,6 +11,7 @@
  25. #include <linux/bcma/bcma.h>
  26. #include <linux/etherdevice.h>
  27. +#include <linux/platform_data/b53.h>
  28. #include <linux/bcm47xx_nvram.h>
  29. #include "bgmac.h"
  30. @@ -1388,6 +1389,17 @@ static const struct ethtool_ops bgmac_et
  31. .set_link_ksettings = phy_ethtool_set_link_ksettings,
  32. };
  33. +static struct b53_platform_data bgmac_b53_pdata = {
  34. +};
  35. +
  36. +static struct platform_device bgmac_b53_dev = {
  37. + .name = "b53-srab-switch",
  38. + .id = -1,
  39. + .dev = {
  40. + .platform_data = &bgmac_b53_pdata,
  41. + },
  42. +};
  43. +
  44. /**************************************************
  45. * MII
  46. **************************************************/
  47. @@ -1534,6 +1546,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
  48. net_dev->hw_features = net_dev->features;
  49. net_dev->vlan_features = net_dev->features;
  50. + if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
  51. + bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
  52. +
  53. + err = platform_device_register(&bgmac_b53_dev);
  54. + if (!err)
  55. + bgmac->b53_device = &bgmac_b53_dev;
  56. + }
  57. +
  58. err = register_netdev(bgmac->net_dev);
  59. if (err) {
  60. dev_err(bgmac->dev, "Cannot register net device\n");
  61. @@ -1556,6 +1576,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
  62. void bgmac_enet_remove(struct bgmac *bgmac)
  63. {
  64. + if (bgmac->b53_device)
  65. + platform_device_unregister(&bgmac_b53_dev);
  66. + bgmac->b53_device = NULL;
  67. +
  68. unregister_netdev(bgmac->net_dev);
  69. phy_disconnect(bgmac->net_dev->phydev);
  70. netif_napi_del(&bgmac->napi);
  71. --- a/drivers/net/ethernet/broadcom/bgmac.h
  72. +++ b/drivers/net/ethernet/broadcom/bgmac.h
  73. @@ -409,6 +409,7 @@
  74. #define BGMAC_FEAT_CC4_IF_SW_TYPE BIT(17)
  75. #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18)
  76. #define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19)
  77. +#define BGMAC_FEAT_SRAB BIT(20)
  78. struct bgmac_slot_info {
  79. union {
  80. @@ -513,6 +514,9 @@ struct bgmac {
  81. u32 (*get_bus_clock)(struct bgmac *bgmac);
  82. void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
  83. u32 set);
  84. +
  85. + /* platform device for associated switch */
  86. + struct platform_device *b53_device;
  87. };
  88. struct bgmac *bgmac_alloc(struct device *dev);