12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576777879808182838485868788 |
- Register switch connected to srab
- Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
- --- a/drivers/net/ethernet/broadcom/bgmac.c
- +++ b/drivers/net/ethernet/broadcom/bgmac.c
- @@ -11,6 +11,7 @@
-
- #include <linux/bcma/bcma.h>
- #include <linux/etherdevice.h>
- +#include <linux/platform_data/b53.h>
- #include <linux/bcm47xx_nvram.h>
- #include "bgmac.h"
-
- @@ -1404,6 +1405,17 @@ static const struct ethtool_ops bgmac_et
- .get_drvinfo = bgmac_get_drvinfo,
- };
-
- +static struct b53_platform_data bgmac_b53_pdata = {
- +};
- +
- +static struct platform_device bgmac_b53_dev = {
- + .name = "b53-srab-switch",
- + .id = -1,
- + .dev = {
- + .platform_data = &bgmac_b53_pdata,
- + },
- +};
- +
- /**************************************************
- * MII
- **************************************************/
- @@ -1550,6 +1562,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
- net_dev->hw_features = net_dev->features;
- net_dev->vlan_features = net_dev->features;
-
- + if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
- + bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
- +
- + err = platform_device_register(&bgmac_b53_dev);
- + if (!err)
- + bgmac->b53_device = &bgmac_b53_dev;
- + }
- +
- err = register_netdev(bgmac->net_dev);
- if (err) {
- dev_err(bgmac->dev, "Cannot register net device\n");
- @@ -1572,6 +1592,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
-
- void bgmac_enet_remove(struct bgmac *bgmac)
- {
- + if (bgmac->b53_device)
- + platform_device_unregister(&bgmac_b53_dev);
- + bgmac->b53_device = NULL;
- +
- unregister_netdev(bgmac->net_dev);
- phy_disconnect(bgmac->net_dev->phydev);
- netif_napi_del(&bgmac->napi);
- --- a/drivers/net/ethernet/broadcom/bgmac.h
- +++ b/drivers/net/ethernet/broadcom/bgmac.h
- @@ -409,6 +409,7 @@
- #define BGMAC_FEAT_CC4_IF_SW_TYPE BIT(17)
- #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18)
- #define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19)
- +#define BGMAC_FEAT_SRAB BIT(20)
-
- struct bgmac_slot_info {
- union {
- @@ -513,6 +514,9 @@ struct bgmac {
- u32 (*get_bus_clock)(struct bgmac *bgmac);
- void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
- u32 set);
- +
- + /* platform device for associated switch */
- + struct platform_device *b53_device;
- };
-
- struct bgmac *bgmac_alloc(struct device *dev);
- --- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
- +++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
- @@ -236,6 +236,7 @@ static int bgmac_probe(struct bcma_devic
- bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
- bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
- bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
- + bgmac->feature_flags |= BGMAC_FEAT_SRAB;
- break;
- case BCMA_CHIP_ID_BCM53573:
- bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
|