From: David S. Miller <davem@davemloft.net>
Date: Mon, 12 Nov 2018 01:57:54 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
X-Git-Tag: v5.15~7332^2~314
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2b9b7502dfcb6169dbf3359702953bf756b4e273;p=platform%2Fkernel%2Flinux-starfive.git

Merge git://git./linux/kernel/git/davem/net
---

2b9b7502dfcb6169dbf3359702953bf756b4e273
diff --cc drivers/net/phy/broadcom.c
index c73e265,7045370..aa73c5c
--- a/drivers/net/phy/broadcom.c
+++ b/drivers/net/phy/broadcom.c
@@@ -629,7 -647,9 +642,8 @@@ static struct phy_driver broadcom_drive
  	.phy_id_mask	= 0xfffffff0,
  	.name		= "Broadcom BCM54616S",
  	.features	= PHY_GBIT_FEATURES,
 -	.flags		= PHY_HAS_INTERRUPT,
  	.config_init	= bcm54xx_config_init,
+ 	.config_aneg	= bcm54616s_config_aneg,
  	.ack_interrupt	= bcm_phy_ack_intr,
  	.config_intr	= bcm_phy_config_intr,
  }, {