Marvell Orion ethernet IP originally is multi-port capable, but SoCs using the IP usually have multiple single-port controllers built in. Currently, orion-gbe driver registers each port device with a constant name, which causes a name conflict with multiple controller instances.
This patch uniquifies port device name generation by prepending controller's base register address to resolve the name conflict. Signed-off-by: Sebastian Hesselbarth <[email protected]> --- Cc: [email protected] --- drivers/net/orion-gbe.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c index 9315127ac7ff..23c8346ec58f 100644 --- a/drivers/net/orion-gbe.c +++ b/drivers/net/orion-gbe.c @@ -399,6 +399,7 @@ static int port_open(struct eth_device *edev) static int port_probe(struct device_d *parent, struct port_priv *port) { + struct orion_gbe *gbe = parent->priv; struct device_d *dev = &port->dev; u32 reg; int ret; @@ -450,7 +451,7 @@ static int port_probe(struct device_d *parent, struct port_priv *port) reg |= RGMII_ENABLE; writel(reg, port->regs + PORT_SC1); - sprintf(dev->name, "orion-gbe-port"); + snprintf(dev->name, MAX_DRIVER_NAME, "%08x.ethernet-port", (u32)gbe->regs); dev->id = port->portno; dev->parent = parent; dev->device_node = port->np; -- 2.0.0 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
