From 8441d49e60e0095acb1c9574135966ceefec4147 Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Mon, 10 May 2021 20:06:09 +0530 Subject: net: ti: am65-cpsw-nuss: Prepare to support non primary ext port CPSW NUSS IP on K3 SoCs can have more than one external port (upto 8) Therefore increase AM65_CPSW_CPSWNU_MAX_PORTS to 9 (8 ext + 1 Root port) as preparation to allow any one of the 8 ports to be used as ethernet interface in U-Boot. Signed-off-by: Vignesh Raghavendra --- drivers/net/ti/am65-cpsw-nuss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net') diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index e6954b64b7..9f11ce63b9 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -26,7 +26,7 @@ #include "cpsw_mdio.h" -#define AM65_CPSW_CPSWNU_MAX_PORTS 2 +#define AM65_CPSW_CPSWNU_MAX_PORTS 9 #define AM65_CPSW_SS_BASE 0x0 #define AM65_CPSW_SGMII_BASE 0x100 -- cgit From 2411e85b99293de8701c42d52b31249f0232622c Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Mon, 10 May 2021 20:06:10 +0530 Subject: net: ti: am65-cpsw-nuss: Don't cache disabled port ID Currently driver may end up caching disabled port ID as active interface. Fix this by bailing out earlier in case port is marked disabled in the DT. Signed-off-by: Vignesh Raghavendra --- drivers/net/ti/am65-cpsw-nuss.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/net') diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index 9f11ce63b9..3534a6d807 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -719,11 +719,11 @@ static int am65_cpsw_probe_cpsw(struct udevice *dev) if (!port_id) continue; - priv->port_id = port_id; cpsw_common->ports[port_id].disabled = disabled; if (disabled) continue; + priv->port_id = port_id; ret = am65_cpsw_ofdata_parse_phy(dev, node); if (ret) goto out; -- cgit From 845e1060d39cd458061e61a4df42fe1969da93fc Mon Sep 17 00:00:00 2001 From: Vignesh Raghavendra Date: Mon, 10 May 2021 20:06:11 +0530 Subject: net: ti: am65-cpsw-nuss: Add a new compatible for AM64 Add a new compatible to support AM64 SoC Signed-off-by: Vignesh Raghavendra --- drivers/net/ti/am65-cpsw-nuss.c | 1 + 1 file changed, 1 insertion(+) (limited to 'drivers/net') diff --git a/drivers/net/ti/am65-cpsw-nuss.c b/drivers/net/ti/am65-cpsw-nuss.c index 3534a6d807..3ab6a30828 100644 --- a/drivers/net/ti/am65-cpsw-nuss.c +++ b/drivers/net/ti/am65-cpsw-nuss.c @@ -782,6 +782,7 @@ out: static const struct udevice_id am65_cpsw_nuss_ids[] = { { .compatible = "ti,am654-cpsw-nuss" }, { .compatible = "ti,j721e-cpsw-nuss" }, + { .compatible = "ti,am642-cpsw-nuss" }, { } }; -- cgit