3 files changed, 51 insertions, 22 deletions

diff --git a/drivers/net/phy/micrel_ksz90x1.c b/drivers/net/phy/micrel_ksz90x1.c
index ee8eae1efd9..a02dbe900b8 100644
--- a/drivers/net/phy/micrel_ksz90x1.c
+++ b/drivers/net/phy/micrel_ksz90x1.c
@@ -7,6 +7,7 @@
  * (C) 2012 NetModule AG, David Andrey, added KSZ9031
  * (C) Copyright 2017 Adaptrum, Inc.
  * Written by Alexandru Gagniuc <alex.g@adaptrum.com> for Adaptrum, Inc.
+ * Copyright (C) 2025 Altera Corporation <www.altera.com>
  */
 #include <dm.h>
 #include <env.h>
@@ -110,6 +111,7 @@ static int ksz90x1_of_config_group(struct phy_device *phydev,
 {
 	struct udevice *dev = phydev->dev;
 	struct phy_driver *drv = phydev->drv;
+	struct ofnode_phandle_args phandle;
 	int val[4];
 	int i, changed = 0, offset, max;
 	u16 regval = 0;
@@ -126,8 +128,14 @@ static int ksz90x1_of_config_group(struct phy_device *phydev,
 	}
 
 	if (!ofnode_valid(node)) {
-		/* No node found, look in the Ethernet node */
-		node = dev_ofnode(dev);
+		if (dev_read_phandle_with_args(dev, "phy-handle", NULL, 0, 0,
+					       &phandle)) {
+			/* No phy-handle found, look in the Ethernet node */
+			node = dev_ofnode(dev);
+		} else {
+			/* phy-handle found */
+			node = phandle.node;
+		}
 	}
 
 	for (i = 0; i < ofcfg->grpsz; i++) {
diff --git a/drivers/net/ti/icssg_prueth.c b/drivers/net/ti/icssg_prueth.c
index 2639f960631..d8df3c9afb0 100644
--- a/drivers/net/ti/icssg_prueth.c
+++ b/drivers/net/ti/icssg_prueth.c
@@ -63,6 +63,7 @@
 
 /* Number of PRU Cores per Slice */
 #define ICSSG_NUM_PRU_CORES		3
+#define ICSSG_NUM_FIRMWARES		6
 
 static int icssg_gmii_select(struct prueth_priv *priv)
 {
@@ -192,25 +193,6 @@ static int icssg_update_link(struct prueth_priv *priv)
 	return phy->link;
 }
 
-struct icssg_firmwares {
-	char *pru;
-	char *rtu;
-	char *txpru;
-};
-
-static struct icssg_firmwares icssg_emac_firmwares[] = {
-	{
-		.pru = "/lib/firmware/ti-pruss/am65x-sr2-pru0-prueth-fw.elf",
-		.rtu = "/lib/firmware/ti-pruss/am65x-sr2-rtu0-prueth-fw.elf",
-		.txpru = "/lib/firmware/ti-pruss/am65x-sr2-txpru0-prueth-fw.elf",
-	},
-	{
-		.pru = "/lib/firmware/ti-pruss/am65x-sr2-pru1-prueth-fw.elf",
-		.rtu = "/lib/firmware/ti-pruss/am65x-sr2-rtu1-prueth-fw.elf",
-		.txpru = "/lib/firmware/ti-pruss/am65x-sr2-txpru1-prueth-fw.elf",
-	}
-};
-
 static int icssg_start_pru_cores(struct udevice *dev)
 {
 	struct prueth_priv *priv = dev_get_priv(dev);
@@ -223,7 +205,7 @@ static int icssg_start_pru_cores(struct udevice *dev)
 
 	slice = priv->port_id;
 	index = slice * ICSSG_NUM_PRU_CORES;
-	firmwares = icssg_emac_firmwares;
+	firmwares = prueth->firmwares;
 
 	ofnode_read_u32_index(dev_ofnode(prueth->dev), "ti,prus", index, &phandle);
 	ret = uclass_get_device_by_phandle_id(UCLASS_REMOTEPROC, phandle, &rproc_dev);
@@ -476,6 +458,24 @@ static const struct eth_ops prueth_ops = {
 	.stop		= prueth_stop,
 };
 
+static char *prepend_fw_path(const char *fw_name)
+{
+	static const char fw_dir[] = "/lib/firmware/";
+	char *result;
+	int len;
+
+	if (!fw_name)
+		return NULL;
+
+	len = strlen(fw_dir) + strlen(fw_name) + 1;
+	result = malloc(len);
+	if (!result)
+		return NULL;
+
+	sprintf(result, "%s%s", fw_dir, fw_name);
+	return result;
+}
+
 static int icssg_ofdata_parse_phy(struct udevice *dev)
 {
 	struct prueth_priv *priv = dev_get_priv(dev);
@@ -534,6 +534,8 @@ static int prueth_probe(struct udevice *dev)
 	struct udevice **prussdev = NULL;
 	ofnode eth_ports_node, eth_node;
 	struct udevice *port_dev;
+	const char **fw_names;
+	int fw_count, i;
 	int ret = 0;
 
 	prueth->dev = dev;
@@ -659,6 +661,18 @@ static int prueth_probe(struct udevice *dev)
 		}
 	}
 
+	/* Parse firmware-name property from DT */
+	fw_count = dev_read_string_list(dev, "firmware-name", &fw_names);
+	if (fw_count != ICSSG_NUM_FIRMWARES) {
+		dev_err(dev, "Expected %d firmware names, got %d\n", ICSSG_NUM_FIRMWARES, fw_count);
+		return -EINVAL;
+	}
+	for (i = 0; i < 2; i++) {
+		prueth->firmwares[i].pru   = prepend_fw_path(fw_names[i * 3 + 0]);
+		prueth->firmwares[i].rtu   = prepend_fw_path(fw_names[i * 3 + 1]);
+		prueth->firmwares[i].txpru = prepend_fw_path(fw_names[i * 3 + 2]);
+	}
+
 	return 0;
 out:
 	clk_disable(&prueth->mdiofck);
diff --git a/drivers/net/ti/icssg_prueth.h b/drivers/net/ti/icssg_prueth.h
index c69cfd4f162..d88b6fa88e7 100644
--- a/drivers/net/ti/icssg_prueth.h
+++ b/drivers/net/ti/icssg_prueth.h
@@ -38,6 +38,12 @@ enum prueth_port {
 	PRUETH_PORT_MII1,	/* physical port MII 1 */
 };
 
+struct icssg_firmwares {
+	char *pru;
+	char *rtu;
+	char *txpru;
+};
+
 struct prueth {
 	struct udevice		*dev;
 	struct udevice		*pruss;
@@ -66,6 +72,7 @@ struct prueth {
 	u8			rtu_core_id;
 	u8			txpru_core_id;
 	u8			icssg_hwcmdseq;
+	struct icssg_firmwares  firmwares[PRUETH_NUM_MACS];
 };
 
 struct prueth_priv {