net: phy: realtek: add support for RTL8211F(D)(I)-VD-CG
Subsystems (3)
PATCH v3 1/1 net: phy: realtek: add support for RTL8211F(D)(I)-VD-CG
From: Clark Wang <[email protected]>
RTL8211F(D)(I)-VD-CG is the pin-to-pin upgrade chip from RTL8211F(D)(I)-CG.
Add new PHY ID for this chip.
It does not support RTL8211F_PHYCR2 anymore, so remove the w/r operation of this register.
---
V2 change:
1. Commit message changed, RTL8221 instead of RTL8821.
2. Add has_phycr2 to struct rtl821x_priv.
V3 change:
There is a typo, actually the phy chip is RTL8211, So I correct it in the coommit message and subject.
--- drivers/net/phy/realtek.c | 44 ++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-)
drivers/net/phy/realtek.c +32 -12
@@ -70,6 +70,7 @@#define RTLGEN_SPEED_MASK 0x0630#define RTL_GENERIC_PHYID 0x001cc800 +#define RTL_8211FVD_PHYID 0x001cc878MODULE_DESCRIPTION ("Realtek PHY driver" );MODULE_AUTHOR ("Johnson Leung" );
@@ -78,6 +79,7 @@ MODULE_LICENSE("GPL");struct rtl821x_priv {u16 phycr1;u16 phycr2; +bool has_phycr2; };static int rtl821x_read_page (struct phy_device *phydev)
@@ -94,6 +96,7 @@ static int rtl821x_probe(struct phy_device *phydev) {struct device *dev = &phydev->mdio.dev;struct rtl821x_priv *priv; +u32 phy_id = phydev->drv->phy_id;int ret; priv =devm_kzalloc (dev,sizeof (*priv),GFP_KERNEL );
@@ -108,13 +111,16 @@ static int rtl821x_probe(struct phy_device *phydev)if (of_property_read_bool (dev->of_node,"realtek,aldps-enable" )) priv->phycr1 |=RTL8211F_ALDPS_PLL_OFF |RTL8211F_ALDPS_ENABLE |RTL8211F_ALDPS_XTAL_OFF ; - ret =phy_read_paged (phydev,0xa43 ,RTL8211F_PHYCR2 ); -if (ret <0 ) -return ret; + priv->has_phycr2 = !(phy_id ==RTL_8211FVD_PHYID ); +if (priv->has_phycr2) { + ret =phy_read_paged (phydev,0xa43 ,RTL8211F_PHYCR2 ); +if (ret <0 ) +return ret; - priv->phycr2 = ret &RTL8211F_CLKOUT_EN ; -if (of_property_read_bool (dev->of_node,"realtek,clkout-disable" )) - priv->phycr2 &= ~RTL8211F_CLKOUT_EN ; + priv->phycr2 = ret &RTL8211F_CLKOUT_EN ; +if (of_property_read_bool (dev->of_node,"realtek,clkout-disable" )) + priv->phycr2 &= ~RTL8211F_CLKOUT_EN ; + } phydev->priv = priv;
@@ -400,12 +406,14 @@ static int rtl8211f_config_init(struct phy_device *phydev) val_rxdly ? "enabled" : "disabled"); } - ret =phy_modify_paged (phydev,0xa43 ,RTL8211F_PHYCR2 , -RTL8211F_CLKOUT_EN , priv->phycr2); -if (ret <0 ) { -dev_err (dev,"clkout configuration failed: %pe\n" , -ERR_PTR (ret)); -return ret; +if (priv->has_phycr2) { + ret =phy_modify_paged (phydev,0xa43 ,RTL8211F_PHYCR2 , +RTL8211F_CLKOUT_EN , priv->phycr2); +if (ret <0 ) { +dev_err (dev,"clkout configuration failed: %pe\n" , +ERR_PTR (ret)); +return ret; + } }return genphy_soft_reset (phydev);
@@ -923,6 +931,18 @@ static struct phy_driver realtek_drvs[] = { .resume = rtl821x_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, + }, { + PHY_ID_MATCH_EXACT(RTL_8211FVD_PHYID), + .name = "RTL8211F-VD Gigabit Ethernet", + .probe = rtl821x_probe, + .config_init = &rtl8211f_config_init, + .read_status = rtlgen_read_status, + .config_intr = &rtl8211f_config_intr, + .handle_interrupt = rtl8211f_handle_interrupt, + .suspend = genphy_suspend, + .resume = rtl821x_resume, + .read_page = rtl821x_read_page, + .write_page = rtl821x_write_page, }, { .name = "Generic FE-GE Realtek PHY", .match_phy_device = rtlgen_match_phy_device,
Signature · 1 line
2.25.1
Kindly ping.
Quoted 124 lines
-----Original Message-----
From: Wei Fang
Sent: 2022年8月17日 9:36
To: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Cc: Clark Wang <[email protected]>
Subject: [PATCH V3 net-next] net: phy: realtek: add support for RTL8211F(D)(I)-VD-CGFrom: Clark Wang <[email protected]>
RTL8211F(D)(I)-VD-CG is the pin-to-pin upgrade chip from RTL8211F(D)(I)-CG.
Add new PHY ID for this chip.
It does not supportRTL8211F_PHYCR2anymore, so remove the w/r operation of this register.Signed-off-by Clark Wang <[email protected]>Signed-off-by Wei Fang <[email protected]>---
V2 change:
1. Commit message changed, RTL8221 instead of RTL8821.
2. Addhas_phycr2to structrtl821x_priv.
V3 change:
There is a typo, actually the phy chip is RTL8211, So I correct it in the coommit message and subject.--- drivers/net/phy/realtek.c | 44 ++++++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 12 deletions(-)drivers/net/phy/realtek.c index renamed from drivers/net/phy/realtek.c +0
-0
a5671ab896b3..3d99fd6664d7100644drivers/net/phy/realtek.c +1
-0@@ -70,6 +70,7 @@#define RTLGEN_SPEED_MASK 0x0630#define RTL_GENERIC_PHYID 0x001cc800 +#define RTL_8211FVD_PHYID 0x001cc878 MODULE_DESCRIPTION("Realtek PHY driver"); MODULE_AUTHOR("JohnsonLeung"); @@ -78,6 +79,7 @@
MODULE_LICENSE("GPL"); structrtl821x_priv{drivers/net/phy/realtek.c +1
-0u16 phycr1;u16 phycr2; +bool has_phycr2; }; static int rtl821x_read_page(struct phy_device *phydev) @@ -94,6 +96,7@@ static int
rtl821x_probe(struct phy_device *phydev){drivers/net/phy/realtek.c +2
-0struct device *dev = &phydev->mdio.dev;struct rtl821x_priv *priv; +u32 phy_id = phydev->drv->phy_id;int ret; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); @@ -108,13 +111,16 @@ static int rtl821x_probe(struct phy_device *phydev) if (of_property_read_bool(dev->of_node, "realtek,aldps-enable")) priv->phycr1 |= RTL8211F_ALDPS_PLL_OFF |
RTL8211F_ALDPS_ENABLE|RTL8211F_ALDPS_XTAL_OFF;drivers/net/phy/realtek.c +17
-12- ret =phy_read_paged (phydev,0xa43 ,RTL8211F_PHYCR2 ); -if (ret <0 ) -return ret; + priv->has_phycr2 = !(phy_id ==RTL_8211FVD_PHYID ); +if (priv->has_phycr2) { + ret =phy_read_paged (phydev,0xa43 ,RTL8211F_PHYCR2 ); +if (ret <0 ) +return ret; - priv->phycr2 = ret &RTL8211F_CLKOUT_EN ; -if (of_property_read_bool (dev->of_node,"realtek,clkout-disable" )) - priv->phycr2 &= ~RTL8211F_CLKOUT_EN ; + priv->phycr2 = ret &RTL8211F_CLKOUT_EN ; +if (of_property_read_bool (dev->of_node,"realtek,clkout-disable" )) + priv->phycr2 &= ~RTL8211F_CLKOUT_EN ; + } phydev->priv = priv;@@ -400,12 +406,14 @@ static int rtl8211f_config_init(struct phy_device *phydev) val_rxdly ? "enabled" : "disabled"); } - ret =phy_modify_paged (phydev,0xa43 ,RTL8211F_PHYCR2 , -RTL8211F_CLKOUT_EN , priv->phycr2); -if (ret <0 ) { -dev_err (dev,"clkout configuration failed: %pe\n" , -ERR_PTR (ret)); -return ret; +if (priv->has_phycr2) { + ret =phy_modify_paged (phydev,0xa43 ,RTL8211F_PHYCR2 , +RTL8211F_CLKOUT_EN , priv->phycr2); +if (ret <0 ) { +dev_err (dev,"clkout configuration failed: %pe\n" , +ERR_PTR (ret)); +return ret; + } }drivers/net/phy/realtek.c +12
-1return genphy_soft_reset (phydev);@@ -923,6 +931,18 @@ static struct phy_driver realtek_drvs[] = { .resume = rtl821x_resume, .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, + }, { + PHY_ID_MATCH_EXACT(RTL_8211FVD_PHYID), + .name = "RTL8211F-VD Gigabit Ethernet", + .probe = rtl821x_probe, + .config_init = &rtl8211f_config_init, + .read_status = rtlgen_read_status, + .config_intr = &rtl8211f_config_intr, + .handle_interrupt = rtl8211f_handle_interrupt, + .suspend = genphy_suspend, + .resume = rtl821x_resume, + .read_page = rtl821x_read_page, + .write_page = rtl821x_write_page, }, { .name = "Generic FE-GE Realtek PHY", .match_phy_device = rtlgen_match_phy_device, --2.25.1
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:
Quoted 10 lines · On Wed, 17 Aug 2022 09:36:18 +0800 you wrote:
From: Clark Wang <[email protected]>
RTL8211F(D)(I)-VD-CG is the pin-to-pin upgrade chip from RTL8211F(D)(I)-CG.
Add new PHY ID for this chip.
It does not supportRTL8211F_PHYCR2anymore, so remove the w/r operation of this register.[...]
Here is the summary with links:
- [V3,net-next] net: phy: realtek: add support for RTL8211F(D)(I)-VD-CG
https://git.kernel.org/netdev/net-next/c/bb726b753f75
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html