ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-24 15:56:49 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

kernel: bgmac: backport patch adding platform support

Browse Source 
It also reworks bcma support by moving specific code to separated file.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Rafał Miłecki 2016-08-17 09:30:44 +02:00
parent 533d16822c
commit 93f2aa44f7
3 changed files with 1289 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/linux/bcm53xx/config-4.4
View File

@ -70,6 +70,8 @@ CONFIG_BCMA_HOST_PCI_POSSIBLE=y
CONFIG_BCMA_HOST_SOC=y CONFIG_BCMA_HOST_SOC=y
CONFIG_BCMA_SFLASH=y CONFIG_BCMA_SFLASH=y
CONFIG_BGMAC=y CONFIG_BGMAC=y
CONFIG_BGMAC_BCMA=y
# CONFIG_BGMAC_PLATFORM is not set
CONFIG_BOUNCE=y CONFIG_BOUNCE=y
CONFIG_CACHE_L2X0=y CONFIG_CACHE_L2X0=y
CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y

1260
target/linux/generic/patches-4.4/075-0005-net-ethernet-bgmac-Add-platform-device-support.patch Normal file
View File

File diff suppressed because it is too large Load Diff

52
target/linux/generic/patches-4.4/773-bgmac-add-srab-switch.patch
View File

@ -4,15 +4,15 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
--- a/drivers/net/ethernet/broadcom/bgmac.c --- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -17,6 +17,7 @@ @@ -11,6 +11,7 @@
#include <linux/phy_fixed.h>
#include <linux/interrupt.h> #include <linux/bcma/bcma.h>
#include <linux/dma-mapping.h> #include <linux/etherdevice.h>
+#include <linux/platform_data/b53.h> +#include <linux/platform_data/b53.h>
#include <linux/bcm47xx_nvram.h> #include <linux/bcm47xx_nvram.h>
#include "bgmac.h"
static const struct bcma_device_id bgmac_bcma_tbl[] = { @@ -1378,6 +1379,17 @@ static const struct ethtool_ops bgmac_et
@@ -1408,6 +1409,17 @@ static const struct ethtool_ops bgmac_et
.get_drvinfo = bgmac_get_drvinfo, .get_drvinfo = bgmac_get_drvinfo,
}; };
@ -30,15 +30,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/************************************************** /**************************************************
* MII * MII
**************************************************/ **************************************************/
@@ -1656,6 +1668,7 @@ static int bgmac_probe(struct bcma_devic @@ -1510,6 +1522,14 @@ int bgmac_enet_probe(struct bgmac *info)
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
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;
@ -53,20 +45,20 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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");
@@ -1730,6 +1751,10 @@ static void bgmac_remove(struct bcma_dev @@ -1533,6 +1553,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
{
struct bgmac *bgmac = bcma_get_drvdata(core);
void bgmac_enet_remove(struct bgmac *bgmac)
{
+ if (bgmac->b53_device) + if (bgmac->b53_device)
+ platform_device_unregister(&bgmac_b53_dev); + platform_device_unregister(&bgmac_b53_dev);
+ bgmac->b53_device = NULL; + 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);
bcma_mdio_mii_unregister(bgmac->mii_bus); netif_napi_del(&bgmac->napi);
--- a/drivers/net/ethernet/broadcom/bgmac.h --- a/drivers/net/ethernet/broadcom/bgmac.h
+++ b/drivers/net/ethernet/broadcom/bgmac.h +++ b/drivers/net/ethernet/broadcom/bgmac.h
@@ -392,6 +392,7 @@ @@ -390,6 +390,7 @@
#define BGMAC_FEAT_NO_CLR_MIB BIT(13) #define BGMAC_FEAT_NO_CLR_MIB BIT(13)
#define BGMAC_FEAT_FORCE_SPEED_2500 BIT(14) #define BGMAC_FEAT_FORCE_SPEED_2500 BIT(14)
#define BGMAC_FEAT_CMDCFG_SR_REV4 BIT(15) #define BGMAC_FEAT_CMDCFG_SR_REV4 BIT(15)
@ -74,13 +66,23 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
struct bgmac_slot_info { struct bgmac_slot_info {
union { union {
@@ -473,6 +474,9 @@ struct bgmac { @@ -494,6 +495,9 @@ struct bgmac {
bool has_robosw; u32 (*get_bus_clock)(struct bgmac *bgmac);
void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
bool loopback; u32 set);
+ +
+ /* platform device for associated switch */ + /* platform device for associated switch */
+ struct platform_device *b53_device; + struct platform_device *b53_device;
}; };
struct mii_bus *bcma_mdio_mii_register(struct bcma_device *core, u8 phyaddr); int bgmac_enet_probe(struct bgmac *info);
--- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
@@ -229,6 +229,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;