kernel: split patches folder up into backport, pending and hack folders
[openwrt/staging/wigyori.git] / target / linux / generic / hack-4.9 / 773-bgmac-add-srab-switch.patch
1 From 3cb240533ab787899dc7f17aa7d6c5b4810e2e58 Mon Sep 17 00:00:00 2001
2 From: Hauke Mehrtens <hauke@hauke-m.de>
3 Date: Fri, 7 Jul 2017 17:26:01 +0200
4 Subject: bcm53xx: bgmac: use srab switch driver
5
6 use the srab switch driver on these SoCs.
7
8 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
9 ---
10 drivers/net/ethernet/broadcom/bgmac-bcma.c | 1 +
11 drivers/net/ethernet/broadcom/bgmac.c | 24 ++++++++++++++++++++++++
12 drivers/net/ethernet/broadcom/bgmac.h | 4 ++++
13 3 files changed, 29 insertions(+)
14
15 Index: linux-4.9.34/drivers/net/ethernet/broadcom/bgmac-bcma.c
16 ===================================================================
17 --- linux-4.9.34.orig/drivers/net/ethernet/broadcom/bgmac-bcma.c
18 +++ linux-4.9.34/drivers/net/ethernet/broadcom/bgmac-bcma.c
19 @@ -230,6 +230,7 @@ static int bgmac_probe(struct bcma_devic
20 bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
21 bgmac->feature_flags |= BGMAC_FEAT_NO_RESET;
22 bgmac->feature_flags |= BGMAC_FEAT_FORCE_SPEED_2500;
23 + bgmac->feature_flags |= BGMAC_FEAT_SRAB;
24 break;
25 case BCMA_CHIP_ID_BCM53573:
26 bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST;
27 Index: linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.c
28 ===================================================================
29 --- linux-4.9.34.orig/drivers/net/ethernet/broadcom/bgmac.c
30 +++ linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.c
31 @@ -11,6 +11,7 @@
32
33 #include <linux/bcma/bcma.h>
34 #include <linux/etherdevice.h>
35 +#include <linux/platform_data/b53.h>
36 #include <linux/bcm47xx_nvram.h>
37 #include "bgmac.h"
38
39 @@ -1387,6 +1388,17 @@ static const struct ethtool_ops bgmac_et
40 .set_link_ksettings = phy_ethtool_set_link_ksettings,
41 };
42
43 +static struct b53_platform_data bgmac_b53_pdata = {
44 +};
45 +
46 +static struct platform_device bgmac_b53_dev = {
47 + .name = "b53-srab-switch",
48 + .id = -1,
49 + .dev = {
50 + .platform_data = &bgmac_b53_pdata,
51 + },
52 +};
53 +
54 /**************************************************
55 * MII
56 **************************************************/
57 @@ -1533,6 +1545,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
58 net_dev->hw_features = net_dev->features;
59 net_dev->vlan_features = net_dev->features;
60
61 + if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
62 + bgmac_b53_pdata.regs = ioremap_nocache(0x18007000, 0x1000);
63 +
64 + err = platform_device_register(&bgmac_b53_dev);
65 + if (!err)
66 + bgmac->b53_device = &bgmac_b53_dev;
67 + }
68 +
69 err = register_netdev(bgmac->net_dev);
70 if (err) {
71 dev_err(bgmac->dev, "Cannot register net device\n");
72 @@ -1555,6 +1575,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
73
74 void bgmac_enet_remove(struct bgmac *bgmac)
75 {
76 + if (bgmac->b53_device)
77 + platform_device_unregister(&bgmac_b53_dev);
78 + bgmac->b53_device = NULL;
79 +
80 unregister_netdev(bgmac->net_dev);
81 phy_disconnect(bgmac->net_dev->phydev);
82 netif_napi_del(&bgmac->napi);
83 Index: linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.h
84 ===================================================================
85 --- linux-4.9.34.orig/drivers/net/ethernet/broadcom/bgmac.h
86 +++ linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.h
87 @@ -409,6 +409,7 @@
88 #define BGMAC_FEAT_CC4_IF_SW_TYPE BIT(17)
89 #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18)
90 #define BGMAC_FEAT_CC7_IF_TYPE_RGMII BIT(19)
91 +#define BGMAC_FEAT_SRAB BIT(20)
92
93 struct bgmac_slot_info {
94 union {
95 @@ -513,6 +514,9 @@ struct bgmac {
96 u32 (*get_bus_clock)(struct bgmac *bgmac);
97 void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
98 u32 set);
99 +
100 + /* platform device for associated switch */
101 + struct platform_device *b53_device;
102 };
103
104 struct bgmac *bgmac_alloc(struct device *dev);