Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16466f42 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: bcm7xxx: remove 28nm wildcard entry 



A wildcard entry with the 32-bits OUI 0x600d8400 was added as part of
the BCM7xxx internal PHY driver, but that entry might match other PHYs
that are not covered by this driver, so let's just remove it.

Fixes: b560a58c ("net: phy: add Broadcom BCM7xxx internal PHY driver")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@greenl8ke.davemloft.net>
parent c9d26423

drivers/net/phy/bcm7xxx.c

+0 −14
Original line number Diff line number Diff line
@@ -286,19 +286,6 @@ static struct phy_driver bcm7xxx_driver[] = { 
	.suspend	= bcm7xxx_suspend,

	.resume		= bcm7xxx_28nm_config_init,

	.driver		= { .owner = THIS_MODULE },

}, {

	.name		= "Broadcom BCM7XXX 28nm",

	.phy_id		= PHY_ID_BCM7XXX_28,

	.phy_id_mask	= PHY_BCM_OUI_MASK,

	.features	= PHY_GBIT_FEATURES |

			  SUPPORTED_Pause | SUPPORTED_Asym_Pause,

	.flags		= PHY_IS_INTERNAL,

	.config_init	= bcm7xxx_28nm_config_init,

	.config_aneg	= genphy_config_aneg,

	.read_status	= genphy_read_status,

	.suspend	= bcm7xxx_suspend,

	.resume		= bcm7xxx_28nm_config_init,

	.driver		= { .owner = THIS_MODULE },

}, {

	.phy_id		= PHY_BCM_OUI_4,

	.phy_id_mask	= 0xffff0000,
@@ -331,7 +318,6 @@ static struct mdio_device_id __maybe_unused bcm7xxx_tbl[] = { 
	{ PHY_ID_BCM7366, 0xfffffff0, },

	{ PHY_ID_BCM7439, 0xfffffff0, },

	{ PHY_ID_BCM7445, 0xfffffff0, },

	{ PHY_ID_BCM7XXX_28, 0xfffffc00 },

	{ PHY_BCM_OUI_4, 0xffff0000 },

	{ PHY_BCM_OUI_5, 0xffffff00 },

	{ }

include/linux/brcmphy.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#define PHY_ID_BCM7366			0x600d8490

#define PHY_ID_BCM7439			0x600d8480

#define PHY_ID_BCM7445			0x600d8510

#define PHY_ID_BCM7XXX_28		0x600d8400



#define PHY_BCM_OUI_MASK		0xfffffc00

#define PHY_BCM_OUI_1			0x00206000