Currently, the naming of the ethernet ports is not handled correctly in the multi-CP (Communication Processor) case. On Armada 8k, the slave-CP also instantiates an ethernet controller with the same device ID's. This patch now takes this into account and adds the required base-id so that the slave-CP ethernet devices will be named "mvpp2-3 ...".
This patch also updates my Copyright notice to include 2017 as well.
Signed-off-by: Stefan Roese sr@denx.de Cc: Stefan Chulski stefanc@marvell.com Cc: Kostya Porotchkin kostap@marvell.com Cc: Nadav Haklai nadavh@marvell.com ---
drivers/net/mvpp2.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mvpp2.c b/drivers/net/mvpp2.c index 66e75e2af4..0283ee2397 100644 --- a/drivers/net/mvpp2.c +++ b/drivers/net/mvpp2.c @@ -6,7 +6,7 @@ * Marcin Wojtas mw@semihalf.com * * U-Boot version: - * Copyright (C) 2016 Stefan Roese sr@denx.de + * Copyright (C) 2016-2017 Stefan Roese sr@denx.de * * This file is licensed under the terms of the GNU General Public * License version 2. This program is licensed "as is" without any @@ -1085,6 +1085,8 @@ static int rxq_number = MVPP2_DEFAULT_RXQ; /* Number of TXQs used by single port */ static int txq_number = MVPP2_DEFAULT_TXQ;
+static int base_id; + #define MVPP2_DRIVER_NAME "mvpp2" #define MVPP2_DRIVER_VERSION "1.0"
@@ -4520,6 +4522,7 @@ static int mvpp2_base_bind(struct udevice *parent) char *name; int subnode; u32 id; + int base_id_add;
/* Lookup eth driver */ drv = lists_uclass_lookup(UCLASS_ETH); @@ -4528,7 +4531,12 @@ static int mvpp2_base_bind(struct udevice *parent) return -ENOENT; }
+ base_id_add = base_id; + fdt_for_each_subnode(subnode, blob, node) { + /* Increment base_id for all subnodes, also the disabled ones */ + base_id++; + /* Skip disabled ports */ if (!fdtdec_get_is_enabled(blob, subnode)) continue; @@ -4538,6 +4546,7 @@ static int mvpp2_base_bind(struct udevice *parent) return -ENOMEM;
id = fdtdec_get_int(blob, subnode, "port-id", -1); + id += base_id_add;
name = calloc(1, 16); sprintf(name, "mvpp2-%d", id);