[PATCH 0/4] TI DP8382x Phy support update

[PATCH 0/4] TI DP8382x Phy support update

[Dan Murphy]

Hello

These patches update and fix some issue found in the TI ethernet PHY drivers.
In adding new support for newer PHYs I found missing items and typos that are
now addressed in this series.

Additional support for the following
DP83825CM, DP83825CS, DP83825S, DP83826C and DP83826NC.

Dan

Dan Murphy (4):
  net: phy: DP83TC811: Fix typo in Kconfig
  net: phy: DP83822: Update Kconfig with DP83825I support
  phy: dp83826: Add phy IDs for DP83826N and 826NC
  net: phy: DP83822: Add support for additional DP83825 devices

 drivers/net/phy/Kconfig   |  9 +++++----
 drivers/net/phy/dp83822.c | 18 ++++++++++++++++--
 2 files changed, 21 insertions(+), 6 deletions(-)

-- 
2.23.0

[PATCH 1/4] net: phy: DP83TC811: Fix typo in Kconfig

[Dan Murphy]

Fix typo in the Kconfig for the DP83TC811 as it indicates support for
the DP83TC822 which is incorrect.

Fixes: 6d749428788b {"net: phy: DP83TC811: Introduce support for the DP83TC811 phy")
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
 drivers/net/phy/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 5848219005d7..ed606194dbd0 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -345,9 +345,9 @@ config DP83822_PHY
 	  Supports the DP83822 PHY.
 
 config DP83TC811_PHY
-	tristate "Texas Instruments DP83TC822 PHY"
+	tristate "Texas Instruments DP83TC811 PHY"
 	---help---
-	  Supports the DP83TC822 PHY.
+	  Supports the DP83TC811 PHY.
 
 config DP83848_PHY
 	tristate "Texas Instruments DP83848 PHY"
-- 
2.23.0

[PATCH 2/4] net: phy: DP83822: Update Kconfig with DP83825I support

[Dan Murphy]

Update the Kconfig description to indicate support for the DP83825I
device as well.

Fixes: 32b12dc8fde1  ("net: phy: Add DP83825I to the DP83822 driver")
Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
 drivers/net/phy/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index ed606194dbd0..8dc461f7574b 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -340,9 +340,9 @@ config DAVICOM_PHY
 	  Currently supports dm9161e and dm9131
 
 config DP83822_PHY
-	tristate "Texas Instruments DP83822 PHY"
+	tristate "Texas Instruments DP83822/825 PHYs"
 	---help---
-	  Supports the DP83822 PHY.
+	  Supports the DP83822 and DP83825I PHYs.
 
 config DP83TC811_PHY
 	tristate "Texas Instruments DP83TC811 PHY"
-- 
2.23.0

[PATCH 3/4] phy: dp83826: Add phy IDs for DP83826N and 826NC

[Dan Murphy]

Add phy IDs to the DP83822 phy driver for the DP83826N
and the DP83826NC devices.  The register map and features
are the same for basic enablement.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
 drivers/net/phy/Kconfig   | 4 ++--
 drivers/net/phy/dp83822.c | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 8dc461f7574b..90c9297280d2 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -340,9 +340,9 @@ 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, DP83826C and DP83826NC PHYs.
 
 config DP83TC811_PHY
 	tristate "Texas Instruments DP83TC811 PHY"
diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
index 8a4b1d167ce2..5159b28baa0f 100644
--- a/drivers/net/phy/dp83822.c
+++ b/drivers/net/phy/dp83822.c
@@ -16,6 +16,8 @@
 
 #define DP83822_PHY_ID	        0x2000a240
 #define DP83825I_PHY_ID		0x2000a150
+#define DP83826C_PHY_ID		0x2000a130
+#define DP83826NC_PHY_ID	0x2000a110
 
 #define DP83822_DEVADDR		0x1f
 
@@ -319,12 +321,16 @@ 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"),
 };
 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 },
 	{ },
 };
 MODULE_DEVICE_TABLE(mdio, dp83822_tbl);
-- 
2.23.0

[PATCH 4/4] net: phy: DP83822: Add support for additional DP83825 devices

[Dan Murphy]

Add PHY IDs for the DP83825CS, DP83825CM and the DP83825S devices to the
DP83822 driver.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
---
 drivers/net/phy/Kconfig   |  3 ++-
 drivers/net/phy/dp83822.c | 12 ++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig
index 90c9297280d2..60700a62d74f 100644
--- a/drivers/net/phy/Kconfig
+++ b/drivers/net/phy/Kconfig
@@ -342,7 +342,8 @@ config DAVICOM_PHY
 config DP83822_PHY
 	tristate "Texas Instruments DP83822/825/826 PHYs"
 	---help---
-	  Supports the DP83822, DP83825I, DP83826C and DP83826NC PHYs.
+	  Supports the DP83822, DP83825I, DP83825CM, DP83825CS, DP83825S,
+	  DP83826C and DP83826NC PHYs.
 
 config DP83TC811_PHY
 	tristate "Texas Instruments DP83TC811 PHY"
diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c
index 5159b28baa0f..fe9aa3ad52a7 100644
--- a/drivers/net/phy/dp83822.c
+++ b/drivers/net/phy/dp83822.c
@@ -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.
  */
@@ -15,7 +14,10 @@
 #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
 
@@ -323,6 +325,9 @@ static struct phy_driver dp83822_driver[] = {
 	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);
 
@@ -331,6 +336,9 @@ static struct mdio_device_id __maybe_unused dp83822_tbl[] = {
 	{ 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);
-- 
2.23.0

Re: [PATCH 0/4] TI DP8382x Phy support update

[Andrew Lunn]

On Fri, Jan 10, 2020 at 12:46:58PM -0600, Dan Murphy wrote:
> Hello
> 
> These patches update and fix some issue found in the TI ethernet PHY drivers.

Hi Dan

Please could you separate fixes from new functionality. Have the fixes
based on net, and new functionality on net-next.

      Thanks
		Andrew

Re: [PATCH 1/4] net: phy: DP83TC811: Fix typo in Kconfig

[Andrew Lunn]

On Fri, Jan 10, 2020 at 12:46:59PM -0600, Dan Murphy wrote:
> Fix typo in the Kconfig for the DP83TC811 as it indicates support for
> the DP83TC822 which is incorrect.
> 
> Fixes: 6d749428788b {"net: phy: DP83TC811: Introduce support for the DP83TC811 phy")
> Signed-off-by: Dan Murphy <dmurphy@ti.com>

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

    Andrew

Re: [PATCH 2/4] net: phy: DP83822: Update Kconfig with DP83825I support

[Andrew Lunn]

On Fri, Jan 10, 2020 at 12:47:00PM -0600, Dan Murphy wrote:
> Update the Kconfig description to indicate support for the DP83825I
> device as well.
> 
> Fixes: 32b12dc8fde1  ("net: phy: Add DP83825I to the DP83822 driver")
> Signed-off-by: Dan Murphy <dmurphy@ti.com>

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

    Andrew

Re: [PATCH 0/4] TI DP8382x Phy support update

[Dan Murphy]

Andrew

On 1/10/20 1:25 PM, Andrew Lunn wrote:
> On Fri, Jan 10, 2020 at 12:46:58PM -0600, Dan Murphy wrote:
>> Hello
>>
>> These patches update and fix some issue found in the TI ethernet PHY drivers.
> Hi Dan
>
> Please could you separate fixes from new functionality. Have the fixes
> based on net, and new functionality on net-next.

You mean separate series between fixes and functionality?

Sure I can separate them but they are dependent on each other.

3 and 4 will not apply cleanly if patch 1 and 2 are not merged first.

Did you want patch 1 and patch 2 sent separately or together as part of 
their own series?

Dan

Re: [PATCH 0/4] TI DP8382x Phy support update

[Andrew Lunn]

> You mean separate series between fixes and functionality?
> 
> Sure I can separate them but they are dependent on each other.

Send 1 and 2 first. After about a week, David will merge net into
net-next, and then you can submit 3 and 4.

	  Andrew

Re: [PATCH 0/4] TI DP8382x Phy support update

[Dan Murphy]

Andrew

On 1/10/20 1:40 PM, Andrew Lunn wrote:
>> You mean separate series between fixes and functionality?
>>
>> Sure I can separate them but they are dependent on each other.
> Send 1 and 2 first. After about a week, David will merge net into
> net-next, and then you can submit 3 and 4.

Thanks.  Got it

Dan


> 	  Andrew