kernel: bgmac: use upstream accepted patches

Signed-off-by: Rafał Miłecki <[email protected]>

target/linux/generic/patches-4.4/170-net-bgmac-fix-reversed-check-for-MII-registration-er.patch → target/linux/generic/patches-4.4/076-0004-net-bgmac-fix-reversed-check-for-MII-registration-er.patch

@@ -1,7 +1,7 @@
-From 031d3de673a8bc0b7b4183ba3898a0abd803920a Mon Sep 17 00:00:00 2001
+From b9f63ae7ba2de2ba19137c5757c0607ce40f3ed5 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
-Date: Wed, 17 Aug 2016 15:31:59 +0200
-Subject: [PATCH net] net: bgmac: fix reversed check for MII registration error
+Date: Wed, 17 Aug 2016 15:37:14 +0200
+Subject: [PATCH] net: bgmac: fix reversed check for MII registration error
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -10,8 +10,7 @@ It was failing on successful registration returning meaningless errors.
 
 Signed-off-by: Rafał Miłecki <[email protected]>
 Fixes: 55954f3bfdac ("net: ethernet: bgmac: move BCMA MDIO Phy code into a separate file")
----
-This fix is intendent for net repository (4.8 release).
+Signed-off-by: David S. Miller <[email protected]>
 ---
  drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

target/linux/generic/patches-4.4/171-net-bgmac-support-Ethernet-core-on-BCM53573-SoCs.patch → target/linux/generic/patches-4.4/077-0001-net-bgmac-support-Ethernet-core-on-BCM53573-SoCs.patch

@@ -1,7 +1,7 @@
-From 7d9acff816e15f7d8a51f912bc663373f1d31e7b Mon Sep 17 00:00:00 2001
+From 1cb94db3d1bfe0075bde78fb2989f17e0a8a3936 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
-Date: Wed, 17 Aug 2016 22:47:22 +0200
-Subject: [PATCH net-next] net: bgmac: support Ethernet core on BCM53573 SoCs
+Date: Wed, 17 Aug 2016 23:00:30 +0200
+Subject: [PATCH] net: bgmac: support Ethernet core on BCM53573 SoCs
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -22,6 +22,7 @@ otherwise generic PHY driver would get some invalid info.
 This has been successfully tested on Tenda AC9 (BCM47189B0).
 
 Signed-off-by: Rafał Miłecki <[email protected]>
+Signed-off-by: David S. Miller <[email protected]>
 ---
  drivers/net/ethernet/broadcom/bgmac-bcma.c | 19 ++++++++++++++++++-
  drivers/net/ethernet/broadcom/bgmac.c      | 25 +++++++++++++++++++++++++

target/linux/generic/patches-4.4/077-0002-net-bgmac-make-it-clear-when-setting-interface-type-.patch

@@ -0,0 +1,31 @@
+From e2d8f646c79f26e094bfaf9b21be614d1e148a67 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <[email protected]>
+Date: Wed, 17 Aug 2016 23:11:52 +0200
+Subject: [PATCH] net: bgmac: make it clear when setting interface type to RMII
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+It doesn't really change anything as BGMAC_CHIPCTL_1_IF_TYPE_RMII is
+equal to 0. It make code a bit clener, so far when reading it one could
+think we forgot to set a proper mode. It also keeps this mode code in
+sync with other ones.
+
+Signed-off-by: Rafał Miłecki <[email protected]>
+Signed-off-by: David S. Miller <[email protected]>
+---
+ drivers/net/ethernet/broadcom/bgmac.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/broadcom/bgmac.c
++++ b/drivers/net/ethernet/broadcom/bgmac.c
+@@ -932,7 +932,8 @@ static void bgmac_chip_reset(struct bgma
+ 			et_swtype <<= 4;
+ 			sw_type = et_swtype;
+ 		} else if (bgmac->feature_flags & BGMAC_FEAT_SW_TYPE_EPHYRMII) {
+-			sw_type = BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII;
++			sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RMII |
++				  BGMAC_CHIPCTL_1_SW_TYPE_EPHYRMII;
+ 		} else if (bgmac->feature_flags & BGMAC_FEAT_SW_TYPE_RGMII) {
+ 			sw_type = BGMAC_CHIPCTL_1_IF_TYPE_RGMII |
+ 				  BGMAC_CHIPCTL_1_SW_TYPE_RGMII;

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

@@ -12,7 +12,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
  #include <linux/bcm47xx_nvram.h>
  #include "bgmac.h"
  
-@@ -1399,6 +1400,17 @@ static const struct ethtool_ops bgmac_et
+@@ -1400,6 +1401,17 @@ static const struct ethtool_ops bgmac_et
  	.get_drvinfo		= bgmac_get_drvinfo,
  };
  
@@ -30,7 +30,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
  /**************************************************
   * MII
   **************************************************/
-@@ -1535,6 +1547,14 @@ int bgmac_enet_probe(struct bgmac *info)
+@@ -1536,6 +1548,14 @@ int bgmac_enet_probe(struct bgmac *info)
  	net_dev->hw_features = net_dev->features;
  	net_dev->vlan_features = net_dev->features;
  
@@ -45,7 +45,7 @@ Signed-off-by: Hauke Mehrtens <[email protected]>
  	err = register_netdev(bgmac->net_dev);
  	if (err) {
  		dev_err(bgmac->dev, "Cannot register net device\n");
-@@ -1558,6 +1578,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
+@@ -1559,6 +1579,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
  
  void bgmac_enet_remove(struct bgmac *bgmac)
  {