forked from openwrt/openwrt
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
generic: 5.15, 6.1: use RTL_8221B_VB_CG_PHYID in Realtek PHY detection
Use the constant RTL_8221B_VB_CG_PHYID instead of a numeric value. Signed-off-by: Mieczyslaw Nalewaj <[email protected]>
- Loading branch information
Showing
4 changed files
with
26 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,15 @@ Signed-off-by: Daniel Golle <[email protected]> | |
|
||
--- a/drivers/net/phy/realtek.c | ||
+++ b/drivers/net/phy/realtek.c | ||
@@ -744,6 +744,38 @@ static int rtl8226_match_phy_device(stru | ||
@@ -79,6 +79,7 @@ | ||
#define RTLGEN_SPEED_MASK 0x0630 | ||
|
||
#define RTL_GENERIC_PHYID 0x001cc800 | ||
+#define RTL_8221B_VB_CG_PHYID 0x001cc849 | ||
|
||
MODULE_DESCRIPTION("Realtek PHY driver"); | ||
MODULE_AUTHOR("Johnson Leung"); | ||
@@ -744,6 +745,38 @@ static int rtl8226_match_phy_device(stru | ||
rtlgen_supports_2_5gbps(phydev); | ||
} | ||
|
||
|
@@ -46,13 +54,13 @@ Signed-off-by: Daniel Golle <[email protected]> | |
+ id |= val; | ||
+ } | ||
+ | ||
+ return (id == 0x001cc849); | ||
+ return (id == RTL_8221B_VB_CG_PHYID); | ||
+} | ||
+ | ||
static int rtl822x_probe(struct phy_device *phydev) | ||
{ | ||
struct device *dev = &phydev->mdio.dev; | ||
@@ -1082,7 +1114,7 @@ static struct phy_driver realtek_drvs[] | ||
@@ -1082,7 +1115,7 @@ static struct phy_driver realtek_drvs[] | ||
.write_page = rtl821x_write_page, | ||
.soft_reset = genphy_soft_reset, | ||
}, { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ Signed-off-by: Jianhui Zhao <[email protected]> | |
|
||
--- a/drivers/net/phy/realtek.c | ||
+++ b/drivers/net/phy/realtek.c | ||
@@ -971,6 +971,51 @@ static int rtl8221b_config_init(struct p | ||
@@ -972,6 +972,51 @@ static int rtl8221b_config_init(struct p | ||
return 0; | ||
} | ||
|
||
|
@@ -64,7 +64,7 @@ Signed-off-by: Jianhui Zhao <[email protected]> | |
static struct phy_driver realtek_drvs[] = { | ||
{ | ||
PHY_ID_MATCH_EXACT(0x00008201), | ||
@@ -1119,6 +1164,8 @@ static struct phy_driver realtek_drvs[] | ||
@@ -1120,6 +1165,8 @@ static struct phy_driver realtek_drvs[] | ||
.get_features = rtl822x_get_features, | ||
.config_init = rtl8221b_config_init, | ||
.config_aneg = rtl822x_config_aneg, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -13,7 +13,15 @@ Signed-off-by: Daniel Golle <[email protected]> | |
|
||
--- a/drivers/net/phy/realtek.c | ||
+++ b/drivers/net/phy/realtek.c | ||
@@ -754,6 +754,38 @@ static int rtl8226_match_phy_device(stru | ||
@@ -80,6 +80,7 @@ | ||
|
||
#define RTL_GENERIC_PHYID 0x001cc800 | ||
#define RTL_8211FVD_PHYID 0x001cc878 | ||
+#define RTL_8221B_VB_CG_PHYID 0x001cc849 | ||
|
||
MODULE_DESCRIPTION("Realtek PHY driver"); | ||
MODULE_AUTHOR("Johnson Leung"); | ||
@@ -754,6 +755,38 @@ static int rtl8226_match_phy_device(stru | ||
rtlgen_supports_2_5gbps(phydev); | ||
} | ||
|
||
|
@@ -46,13 +54,13 @@ Signed-off-by: Daniel Golle <[email protected]> | |
+ id |= val; | ||
+ } | ||
+ | ||
+ return (id == 0x001cc849); | ||
+ return (id == RTL_8221B_VB_CG_PHYID); | ||
+} | ||
+ | ||
static int rtl822x_probe(struct phy_device *phydev) | ||
{ | ||
struct device *dev = &phydev->mdio.dev; | ||
@@ -1104,7 +1136,7 @@ static struct phy_driver realtek_drvs[] | ||
@@ -1104,7 +1137,7 @@ static struct phy_driver realtek_drvs[] | ||
.write_page = rtl821x_write_page, | ||
.soft_reset = genphy_soft_reset, | ||
}, { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,7 +12,7 @@ Signed-off-by: Jianhui Zhao <[email protected]> | |
|
||
--- a/drivers/net/phy/realtek.c | ||
+++ b/drivers/net/phy/realtek.c | ||
@@ -981,6 +981,51 @@ static int rtl8221b_config_init(struct p | ||
@@ -982,6 +982,51 @@ static int rtl8221b_config_init(struct p | ||
return 0; | ||
} | ||
|
||
|
@@ -64,7 +64,7 @@ Signed-off-by: Jianhui Zhao <[email protected]> | |
static struct phy_driver realtek_drvs[] = { | ||
{ | ||
PHY_ID_MATCH_EXACT(0x00008201), | ||
@@ -1141,6 +1186,8 @@ static struct phy_driver realtek_drvs[] | ||
@@ -1142,6 +1187,8 @@ static struct phy_driver realtek_drvs[] | ||
.get_features = rtl822x_get_features, | ||
.config_init = rtl8221b_config_init, | ||
.config_aneg = rtl822x_config_aneg, | ||
|