Commit aab0c0e6 authored by Kevin Hao's avatar Kevin Hao Committed by David S. Miller
Browse files

Revert "net/phy: Add Vitesse 8641 phy ID" 



This reverts commit 1298267b.

That commit claim that the Vitesse VSC8641 is compatible with Vitesse
82xx. But this is not true. It seems that all the registers used
in Vitesse phy driver are not compatible between 8641 and 82xx.
It does cause malfunction of the Ethernet on p1010rdb-pa board.
So we definitely need a rework in order to support the 8641 phy
in this driver.

Signed-off-by: default avatarKevin Hao <haokexin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7a8a8e75

drivers/net/phy/vitesse.c

+0 −14
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
#define PHY_ID_VSC8244			0x000fc6c0

#define PHY_ID_VSC8514			0x00070670

#define PHY_ID_VSC8574			0x000704a0

#define PHY_ID_VSC8641			0x00070431

#define PHY_ID_VSC8662			0x00070660

#define PHY_ID_VSC8221			0x000fc550

#define PHY_ID_VSC8211			0x000fc4b0
@@ -272,18 +271,6 @@ static struct phy_driver vsc82xx_driver[] = { 
	.ack_interrupt  = &vsc824x_ack_interrupt,

	.config_intr    = &vsc82xx_config_intr,

	.driver         = { .owner = THIS_MODULE,},

}, {

	.phy_id         = PHY_ID_VSC8641,

	.name           = "Vitesse VSC8641",

	.phy_id_mask    = 0x000ffff0,

	.features       = PHY_GBIT_FEATURES,

	.flags          = PHY_HAS_INTERRUPT,

	.config_init    = &vsc824x_config_init,

	.config_aneg    = &vsc82x4_config_aneg,

	.read_status    = &genphy_read_status,

	.ack_interrupt  = &vsc824x_ack_interrupt,

	.config_intr    = &vsc82xx_config_intr,

	.driver         = { .owner = THIS_MODULE,},

}, {

	.phy_id         = PHY_ID_VSC8662,

	.name           = "Vitesse VSC8662",
@@ -331,7 +318,6 @@ static struct mdio_device_id __maybe_unused vitesse_tbl[] = { 
	{ PHY_ID_VSC8244, 0x000fffc0 },

	{ PHY_ID_VSC8514, 0x000ffff0 },

	{ PHY_ID_VSC8574, 0x000ffff0 },

	{ PHY_ID_VSC8641, 0x000ffff0 },

	{ PHY_ID_VSC8662, 0x000ffff0 },

	{ PHY_ID_VSC8221, 0x000ffff0 },

	{ PHY_ID_VSC8211, 0x000ffff0 },

CRA Git | Maintained and supported by SUSTech CRA and CCSE