Commit 790e0114 authored by David S. Miller's avatar David S. Miller

Merge branch 'Add-PHY-IDs-for-DP83825-6'

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d9f6e67 2ace13e1
...@@ -346,9 +346,10 @@ config DAVICOM_PHY ...@@ -346,9 +346,10 @@ config DAVICOM_PHY
Currently supports dm9161e and dm9131 Currently supports dm9161e and dm9131
config DP83822_PHY config DP83822_PHY
tristate "Texas Instruments DP83822/825 PHYs" tristate "Texas Instruments DP83822/825/826 PHYs"
---help--- ---help---
Supports the DP83822 and DP83825I PHYs. Supports the DP83822, DP83825I, DP83825CM, DP83825CS, DP83825S,
DP83826C and DP83826NC PHYs.
config DP83TC811_PHY config DP83TC811_PHY
tristate "Texas Instruments DP83TC811 PHY" tristate "Texas Instruments DP83TC811 PHY"
......
// SPDX-License-Identifier: GPL-2.0 // SPDX-License-Identifier: GPL-2.0
/* /* Driver for the Texas Instruments DP83822, DP83825 and DP83826 PHYs.
* Driver for the Texas Instruments DP83822 PHY
* *
* Copyright (C) 2017 Texas Instruments Inc. * Copyright (C) 2017 Texas Instruments Inc.
*/ */
...@@ -15,7 +14,12 @@ ...@@ -15,7 +14,12 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#define DP83822_PHY_ID 0x2000a240 #define DP83822_PHY_ID 0x2000a240
#define DP83825S_PHY_ID 0x2000a140
#define DP83825I_PHY_ID 0x2000a150 #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 #define DP83822_DEVADDR 0x1f
...@@ -319,12 +323,22 @@ static int dp83822_resume(struct phy_device *phydev) ...@@ -319,12 +323,22 @@ static int dp83822_resume(struct phy_device *phydev)
static struct phy_driver dp83822_driver[] = { static struct phy_driver dp83822_driver[] = {
DP83822_PHY_DRIVER(DP83822_PHY_ID, "TI DP83822"), DP83822_PHY_DRIVER(DP83822_PHY_ID, "TI DP83822"),
DP83822_PHY_DRIVER(DP83825I_PHY_ID, "TI DP83825I"), 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); module_phy_driver(dp83822_driver);
static struct mdio_device_id __maybe_unused dp83822_tbl[] = { static struct mdio_device_id __maybe_unused dp83822_tbl[] = {
{ DP83822_PHY_ID, 0xfffffff0 }, { DP83822_PHY_ID, 0xfffffff0 },
{ DP83825I_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); MODULE_DEVICE_TABLE(mdio, dp83822_tbl);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment