net: phy: realtek: use new PHYID matching macros (ca494936) · Commits · 戴 / test

drivers/net/phy/realtek.c

+10 −19

Original line number	Diff line number	Diff line
		@@ -213,14 +213,12 @@ static int rtl8366rb_config_init(struct phy_device *phydev)

		static struct phy_driver realtek_drvs[] = {
		{
		.phy_id = 0x00008201,
		PHY_ID_MATCH_EXACT(0x00008201),
		.name = "RTL8201CP Ethernet",
		.phy_id_mask = 0x0000ffff,
		.features = PHY_BASIC_FEATURES,
		}, {
		.phy_id = 0x001cc816,
		PHY_ID_MATCH_EXACT(0x001cc816),
		.name = "RTL8201F Fast Ethernet",
		.phy_id_mask = 0x001fffff,
		.features = PHY_BASIC_FEATURES,
		.ack_interrupt = &rtl8201_ack_interrupt,
		.config_intr = &rtl8201_config_intr,
		@@ -229,17 +227,15 @@ static struct phy_driver realtek_drvs[] = {
		.read_page = rtl821x_read_page,
		.write_page = rtl821x_write_page,
		}, {
		.phy_id = 0x001cc910,
		PHY_ID_MATCH_EXACT(0x001cc910),
		.name = "RTL8211 Gigabit Ethernet",
		.phy_id_mask = 0x001fffff,
		.features = PHY_GBIT_FEATURES,
		.config_aneg = rtl8211_config_aneg,
		.read_mmd = &genphy_read_mmd_unsupported,
		.write_mmd = &genphy_write_mmd_unsupported,
		}, {
		.phy_id = 0x001cc912,
		PHY_ID_MATCH_EXACT(0x001cc912),
		.name = "RTL8211B Gigabit Ethernet",
		.phy_id_mask = 0x001fffff,
		.features = PHY_GBIT_FEATURES,
		.ack_interrupt = &rtl821x_ack_interrupt,
		.config_intr = &rtl8211b_config_intr,
		@@ -248,35 +244,31 @@ static struct phy_driver realtek_drvs[] = {
		.suspend = rtl8211b_suspend,
		.resume = rtl8211b_resume,
		}, {
		.phy_id = 0x001cc913,
		PHY_ID_MATCH_EXACT(0x001cc913),
		.name = "RTL8211C Gigabit Ethernet",
		.phy_id_mask = 0x001fffff,
		.features = PHY_GBIT_FEATURES,
		.config_init = rtl8211c_config_init,
		.read_mmd = &genphy_read_mmd_unsupported,
		.write_mmd = &genphy_write_mmd_unsupported,
		}, {
		.phy_id = 0x001cc914,
		PHY_ID_MATCH_EXACT(0x001cc914),
		.name = "RTL8211DN Gigabit Ethernet",
		.phy_id_mask = 0x001fffff,
		.features = PHY_GBIT_FEATURES,
		.ack_interrupt = rtl821x_ack_interrupt,
		.config_intr = rtl8211e_config_intr,
		.suspend = genphy_suspend,
		.resume = genphy_resume,
		}, {
		.phy_id = 0x001cc915,
		PHY_ID_MATCH_EXACT(0x001cc915),
		.name = "RTL8211E Gigabit Ethernet",
		.phy_id_mask = 0x001fffff,
		.features = PHY_GBIT_FEATURES,
		.ack_interrupt = &rtl821x_ack_interrupt,
		.config_intr = &rtl8211e_config_intr,
		.suspend = genphy_suspend,
		.resume = genphy_resume,
		}, {
		.phy_id = 0x001cc916,
		PHY_ID_MATCH_EXACT(0x001cc916),
		.name = "RTL8211F Gigabit Ethernet",
		.phy_id_mask = 0x001fffff,
		.features = PHY_GBIT_FEATURES,
		.config_init = &rtl8211f_config_init,
		.ack_interrupt = &rtl8211f_ack_interrupt,
		@@ -286,9 +278,8 @@ static struct phy_driver realtek_drvs[] = {
		.read_page = rtl821x_read_page,
		.write_page = rtl821x_write_page,
		}, {
		.phy_id = 0x001cc961,
		PHY_ID_MATCH_EXACT(0x001cc961),
		.name = "RTL8366RB Gigabit Ethernet",
		.phy_id_mask = 0x001fffff,
		.features = PHY_GBIT_FEATURES,
		.config_init = &rtl8366rb_config_init,
		.suspend = genphy_suspend,
		@@ -299,7 +290,7 @@ static struct phy_driver realtek_drvs[] = {
		module_phy_driver(realtek_drvs);

		static const struct mdio_device_id __maybe_unused realtek_tbl[] = {
		{ 0x001cc800, GENMASK(31, 10) },
		{ PHY_ID_MATCH_VENDOR(0x001cc800) },
		{ }
		};

Admin message