Skip to content

Commit

Permalink
Merge branch 'Add-PHY-IDs-for-DP83825-6'
Browse files Browse the repository at this point in the history
Dan Murphy says:

====================
Add PHY IDs for DP83825/6

Adding new PHY IDs for the DP83825 and DP83826 TI Ethernet PHYs to the DP83822
PHY driver.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
David S. Miller committed Jan 23, 2020
2 parents 6d9f6e6 + 2ace13e commit 790e011
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
5 changes: 3 additions & 2 deletions drivers/net/phy/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,10 @@ config DAVICOM_PHY
Currently supports dm9161e and dm9131

config DP83822_PHY
tristate "Texas Instruments DP83822/825 PHYs"
tristate "Texas Instruments DP83822/825/826 PHYs"
---help---
Supports the DP83822 and DP83825I PHYs.
Supports the DP83822, DP83825I, DP83825CM, DP83825CS, DP83825S,
DP83826C and DP83826NC PHYs.

config DP83TC811_PHY
tristate "Texas Instruments DP83TC811 PHY"
Expand Down
18 changes: 16 additions & 2 deletions drivers/net/phy/dp83822.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
/*
* Driver for the Texas Instruments DP83822 PHY
/* Driver for the Texas Instruments DP83822, DP83825 and DP83826 PHYs.
*
* Copyright (C) 2017 Texas Instruments Inc.
*/
Expand All @@ -15,7 +14,12 @@
#include <linux/netdevice.h>

#define DP83822_PHY_ID 0x2000a240
#define DP83825S_PHY_ID 0x2000a140
#define DP83825I_PHY_ID 0x2000a150
#define DP83825CM_PHY_ID 0x2000a160
#define DP83825CS_PHY_ID 0x2000a170
#define DP83826C_PHY_ID 0x2000a130
#define DP83826NC_PHY_ID 0x2000a110

#define DP83822_DEVADDR 0x1f

Expand Down Expand Up @@ -319,12 +323,22 @@ static int dp83822_resume(struct phy_device *phydev)
static struct phy_driver dp83822_driver[] = {
DP83822_PHY_DRIVER(DP83822_PHY_ID, "TI DP83822"),
DP83822_PHY_DRIVER(DP83825I_PHY_ID, "TI DP83825I"),
DP83822_PHY_DRIVER(DP83826C_PHY_ID, "TI DP83826C"),
DP83822_PHY_DRIVER(DP83826NC_PHY_ID, "TI DP83826NC"),
DP83822_PHY_DRIVER(DP83825S_PHY_ID, "TI DP83825S"),
DP83822_PHY_DRIVER(DP83825CM_PHY_ID, "TI DP83825M"),
DP83822_PHY_DRIVER(DP83825CS_PHY_ID, "TI DP83825CS"),
};
module_phy_driver(dp83822_driver);

static struct mdio_device_id __maybe_unused dp83822_tbl[] = {
{ DP83822_PHY_ID, 0xfffffff0 },
{ DP83825I_PHY_ID, 0xfffffff0 },
{ DP83826C_PHY_ID, 0xfffffff0 },
{ DP83826NC_PHY_ID, 0xfffffff0 },
{ DP83825S_PHY_ID, 0xfffffff0 },
{ DP83825CM_PHY_ID, 0xfffffff0 },
{ DP83825CS_PHY_ID, 0xfffffff0 },
{ },
};
MODULE_DEVICE_TABLE(mdio, dp83822_tbl);
Expand Down

0 comments on commit 790e011

Please sign in to comment.