From eee46a197b2ff63ba79d55fbf27728a9c25b8a03 Mon Sep 17 00:00:00 2001 From: Bhadram Varka Date: Thu, 2 Sep 2021 00:03:59 +0530 Subject: [PATCH] nvethernet: get interface name from DT Bug 200763996 Change-Id: I7a6636eeace9aff162763aa8260d9d1eda3a9216 Signed-off-by: Bhadram Varka Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2587523 Tested-by: mobile promotions Reviewed-by: mobile promotions --- .../net/ethernet/nvidia/nvethernet/ether_linux.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c index cc479fed..bd739400 100644 --- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c +++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c @@ -5963,6 +5963,7 @@ static int ether_probe(struct platform_device *pdev) struct net_device *ndev; int ret = 0, i, val; void __iomem *reg; + const char *if_name; /* WAR to program PAD control registers until MB1 changes done */ if (tegra_get_chip_id() == TEGRA234) { @@ -6030,9 +6031,18 @@ static int ether_probe(struct platform_device *pdev) return -ENOMEM; } - /* allocate and set up the ethernet device */ - ndev = alloc_etherdev_mq((int)sizeof(struct ether_priv_data), - num_dma_chans); + if_name = (const char *)of_get_property(pdev->dev.of_node, + "nvidia,if-name", NULL); + if (if_name) { + ndev = alloc_netdev_mqs((int)sizeof(struct ether_priv_data), if_name, + NET_NAME_UNKNOWN, ether_setup, + num_dma_chans, num_dma_chans); + } else { + /* allocate and set up the ethernet device */ + ndev = alloc_etherdev_mq((int)sizeof(struct ether_priv_data), + num_dma_chans); + } + if (ndev == NULL) { dev_err(&pdev->dev, "failed to allocate net device\n"); return -ENOMEM;