2015-12-02 22:23:22 +00:00
|
|
|
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
|
|
|
|
@@ -17,6 +17,7 @@
|
|
|
|
#include <linux/phy_fixed.h>
|
|
|
|
#include <linux/interrupt.h>
|
|
|
|
#include <linux/dma-mapping.h>
|
|
|
|
+#include <linux/platform_data/b53.h>
|
|
|
|
#include <linux/bcm47xx_nvram.h>
|
|
|
|
|
|
|
|
static const struct bcma_device_id bgmac_bcma_tbl[] = {
|
2016-08-17 05:45:48 +00:00
|
|
|
@@ -1408,6 +1409,17 @@ static const struct ethtool_ops bgmac_et
|
2016-08-16 22:06:14 +00:00
|
|
|
.get_drvinfo = bgmac_get_drvinfo,
|
|
|
|
};
|
2015-12-02 22:23:22 +00:00
|
|
|
|
|
|
|
+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,
|
|
|
|
+ },
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
/**************************************************
|
2016-08-16 22:06:14 +00:00
|
|
|
* MII
|
2015-12-02 22:23:22 +00:00
|
|
|
**************************************************/
|
2016-08-17 05:45:48 +00:00
|
|
|
@@ -1656,6 +1668,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;
|
|
|
|
default:
|
|
|
|
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
|
|
|
|
@@ -1703,6 +1716,14 @@ static int bgmac_probe(struct bcma_devic
|
2015-12-02 22:23:22 +00:00
|
|
|
net_dev->hw_features = net_dev->features;
|
|
|
|
net_dev->vlan_features = net_dev->features;
|
|
|
|
|
2016-08-17 05:45:48 +00:00
|
|
|
+ if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
|
2015-12-02 22:23:22 +00:00
|
|
|
+ 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) {
|
2016-08-16 21:24:26 +00:00
|
|
|
dev_err(bgmac->dev, "Cannot register net device\n");
|
2016-08-17 05:45:48 +00:00
|
|
|
@@ -1730,6 +1751,10 @@ static void bgmac_remove(struct bcma_dev
|
2015-12-02 22:23:22 +00:00
|
|
|
{
|
|
|
|
struct bgmac *bgmac = bcma_get_drvdata(core);
|
|
|
|
|
|
|
|
+ if (bgmac->b53_device)
|
|
|
|
+ platform_device_unregister(&bgmac_b53_dev);
|
|
|
|
+ bgmac->b53_device = NULL;
|
|
|
|
+
|
|
|
|
unregister_netdev(bgmac->net_dev);
|
2016-08-16 22:06:14 +00:00
|
|
|
phy_disconnect(bgmac->net_dev->phydev);
|
|
|
|
bcma_mdio_mii_unregister(bgmac->mii_bus);
|
2015-12-02 22:23:22 +00:00
|
|
|
--- a/drivers/net/ethernet/broadcom/bgmac.h
|
|
|
|
+++ b/drivers/net/ethernet/broadcom/bgmac.h
|
2016-08-17 05:45:48 +00:00
|
|
|
@@ -392,6 +392,7 @@
|
|
|
|
#define BGMAC_FEAT_NO_CLR_MIB BIT(13)
|
|
|
|
#define BGMAC_FEAT_FORCE_SPEED_2500 BIT(14)
|
|
|
|
#define BGMAC_FEAT_CMDCFG_SR_REV4 BIT(15)
|
|
|
|
+#define BGMAC_FEAT_SRAB BIT(16)
|
|
|
|
|
|
|
|
struct bgmac_slot_info {
|
|
|
|
union {
|
|
|
|
@@ -473,6 +474,9 @@ struct bgmac {
|
2015-12-02 22:23:22 +00:00
|
|
|
bool has_robosw;
|
|
|
|
|
|
|
|
bool loopback;
|
|
|
|
+
|
|
|
|
+ /* platform device for associated switch */
|
|
|
|
+ struct platform_device *b53_device;
|
|
|
|
};
|
|
|
|
|
2016-08-16 22:06:14 +00:00
|
|
|
struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr);
|