[net-next] net: phy: aquantia: add AQR113 PHY ID

Message ID 20240213180228.15859-1-ansuelsmth@gmail.com
State New
Headers
Series [net-next] net: phy: aquantia: add AQR113 PHY ID |

Commit Message

Christian Marangi Feb. 13, 2024, 6:02 p.m. UTC
  Add Aquantia AQR113 PHY ID. Aquantia AQR113 is just a chip size variant of
the already supported AQR133C where the only difference is the PHY ID
and the hw chip size.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
 drivers/net/phy/aquantia/aquantia_main.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
  

Comments

Andrew Lunn Feb. 14, 2024, 6:05 p.m. UTC | #1
On Tue, Feb 13, 2024 at 07:02:26PM +0100, Christian Marangi wrote:
> Add Aquantia AQR113 PHY ID. Aquantia AQR113 is just a chip size variant of
> the already supported AQR133C where the only difference is the PHY ID
> and the hw chip size.
> 
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew
  
Paolo Abeni Feb. 15, 2024, 12:35 p.m. UTC | #2
Hi,

On Wed, 2024-02-14 at 19:05 +0100, Andrew Lunn wrote:
> On Tue, Feb 13, 2024 at 07:02:26PM +0100, Christian Marangi wrote:
> > Add Aquantia AQR113 PHY ID. Aquantia AQR113 is just a chip size variant of
> > the already supported AQR133C where the only difference is the PHY ID
> > and the hw chip size.
> > 
> > Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> 
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>

This does not apply cleanly anymore after "net: phy: aquantia: add
AQR111 and AQR111B0 PHY ID". Could you please rebase it?

Thanks!

Paolo
  
Christian Marangi Feb. 15, 2024, 3:31 p.m. UTC | #3
On Thu, Feb 15, 2024 at 01:35:40PM +0100, Paolo Abeni wrote:
> Hi,
> 
> On Wed, 2024-02-14 at 19:05 +0100, Andrew Lunn wrote:
> > On Tue, Feb 13, 2024 at 07:02:26PM +0100, Christian Marangi wrote:
> > > Add Aquantia AQR113 PHY ID. Aquantia AQR113 is just a chip size variant of
> > > the already supported AQR133C where the only difference is the PHY ID
> > > and the hw chip size.
> > > 
> > > Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> > 
> > Reviewed-by: Andrew Lunn <andrew@lunn.ch>
> 
> This does not apply cleanly anymore after "net: phy: aquantia: add
> AQR111 and AQR111B0 PHY ID". Could you please rebase it?
>

Sure, sent v2 and thanks for checking this.
  

Patch

diff --git a/drivers/net/phy/aquantia/aquantia_main.c b/drivers/net/phy/aquantia/aquantia_main.c
index 97a2fafa15ca..aba3a52af11d 100644
--- a/drivers/net/phy/aquantia/aquantia_main.c
+++ b/drivers/net/phy/aquantia/aquantia_main.c
@@ -24,6 +24,7 @@ 
 #define PHY_ID_AQR405	0x03a1b4b0
 #define PHY_ID_AQR112	0x03a1b662
 #define PHY_ID_AQR412	0x03a1b712
+#define PHY_ID_AQR113	0x31c31c40
 #define PHY_ID_AQR113C	0x31c31c12
 
 #define MDIO_PHYXS_VEND_IF_STATUS		0xe812
@@ -863,6 +864,25 @@  static struct phy_driver aqr_driver[] = {
 	.get_stats	= aqr107_get_stats,
 	.link_change_notify = aqr107_link_change_notify,
 },
+{
+	PHY_ID_MATCH_MODEL(PHY_ID_AQR113),
+	.name		= "Aquantia AQR113",
+	.probe          = aqr107_probe,
+	.get_rate_matching = aqr107_get_rate_matching,
+	.config_init    = aqr113c_config_init,
+	.config_aneg    = aqr_config_aneg,
+	.config_intr    = aqr_config_intr,
+	.handle_interrupt       = aqr_handle_interrupt,
+	.read_status    = aqr107_read_status,
+	.get_tunable    = aqr107_get_tunable,
+	.set_tunable    = aqr107_set_tunable,
+	.suspend        = aqr107_suspend,
+	.resume         = aqr107_resume,
+	.get_sset_count = aqr107_get_sset_count,
+	.get_strings    = aqr107_get_strings,
+	.get_stats      = aqr107_get_stats,
+	.link_change_notify = aqr107_link_change_notify,
+},
 {
 	PHY_ID_MATCH_MODEL(PHY_ID_AQR113C),
 	.name           = "Aquantia AQR113C",
@@ -896,6 +916,7 @@  static struct mdio_device_id __maybe_unused aqr_tbl[] = {
 	{ PHY_ID_MATCH_MODEL(PHY_ID_AQR405) },
 	{ PHY_ID_MATCH_MODEL(PHY_ID_AQR112) },
 	{ PHY_ID_MATCH_MODEL(PHY_ID_AQR412) },
+	{ PHY_ID_MATCH_MODEL(PHY_ID_AQR113) },
 	{ PHY_ID_MATCH_MODEL(PHY_ID_AQR113C) },
 	{ }
 };