Skip to content
Snippets Groups Projects
Commit c497014a authored by Oskar Viljasaar's avatar Oskar Viljasaar
Browse files

Import openwrt hack patch 773-bgmac-add-srab-switch.patch

parent 937bbaa7
No related branches found
No related tags found
No related merge requests found
...@@ -268,6 +268,7 @@ static int bgmac_probe(struct bcma_device *core) ...@@ -268,6 +268,7 @@ static int bgmac_probe(struct bcma_device *core)
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
bgmac->feature_flags |= BGMAC_FEAT_NO_RESET; bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500; bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
bgmac->feature_flags |= BGMAC_FEAT_SRAB;
break; break;
default: default:
bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
......
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <linux/bcma/bcma.h> #include <linux/bcma/bcma.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/platform_data/b53.h>
#include <linux/bcm47xx_nvram.h> #include <linux/bcm47xx_nvram.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/phy_fixed.h> #include <linux/phy_fixed.h>
...@@ -1409,6 +1410,17 @@ static const struct ethtool_ops bgmac_ethtool_ops = { ...@@ -1409,6 +1410,17 @@ static const struct ethtool_ops bgmac_ethtool_ops = {
.set_link_ksettings = phy_ethtool_set_link_ksettings, .set_link_ksettings = phy_ethtool_set_link_ksettings,
}; };
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 * MII
**************************************************/ **************************************************/
...@@ -1540,6 +1552,14 @@ int bgmac_enet_probe(struct bgmac *bgmac) ...@@ -1540,6 +1552,14 @@ int bgmac_enet_probe(struct bgmac *bgmac)
net_dev->hw_features = net_dev->features; net_dev->hw_features = net_dev->features;
net_dev->vlan_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); err = register_netdev(bgmac->net_dev);
if (err) { if (err) {
dev_err(bgmac->dev, "Cannot register net device\n"); dev_err(bgmac->dev, "Cannot register net device\n");
...@@ -1562,6 +1582,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe); ...@@ -1562,6 +1582,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
void bgmac_enet_remove(struct bgmac *bgmac) 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); unregister_netdev(bgmac->net_dev);
phy_disconnect(bgmac->net_dev->phydev); phy_disconnect(bgmac->net_dev->phydev);
netif_napi_del(&bgmac->napi); netif_napi_del(&bgmac->napi);
......
...@@ -427,6 +427,7 @@ ...@@ -427,6 +427,7 @@
#define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18) #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18)
#define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19) #define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19)
#define BGMAC_FEAT_IDM_MASK BIT(20) #define BGMAC_FEAT_IDM_MASK BIT(20)
#define BGMAC_FEAT_SRAB BIT(21)
struct bgmac_slot_info { struct bgmac_slot_info {
union { union {
...@@ -532,6 +533,9 @@ struct bgmac { ...@@ -532,6 +533,9 @@ struct bgmac {
void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask, void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
u32 set); u32 set);
int (*phy_connect)(struct bgmac *bgmac); int (*phy_connect)(struct bgmac *bgmac);
/* platform device for associated switch */
struct platform_device *b53_device;
}; };
struct bgmac *bgmac_alloc(struct device *dev); struct bgmac *bgmac_alloc(struct device *dev);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment