Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rockchip: fix OF devname configuration for r8169

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
(cherry picked from commit 07900bc830)
This commit is contained in:
Tianling Shen
2024-05-10 19:52:48 +08:00
parent 4b1b79e846
commit f125ef8cdb
1 changed files with 15 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch
View File

@@ -1,33 +1,19 @@
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2145,6 +2145,22 @@ void r8169_apply_firmware(struct rtl8169
}
}
@@ -5333,12 +5333,16 @@ static int rtl_init_one(struct pci_dev *
int jumbo_max, region, rc;
enum mac_version chipset;
struct net_device *dev;
+ const char *devname = of_get_property(pdev->dev.of_node, "label", NULL);
u16 xid;
+static int rtl8169_devname_configuration(struct rtl8169_private *tp)
+{
+ const char *devname;
+ int ret;
+
+ ret = of_property_read_string(tp->pci_dev->dev.of_node,
+ "label", &devname);
+
+ if (ret)
+ return ret;
+
+ strlcpy(tp->dev->name, devname, IFNAMSIZ);
+
+ return 0;
+}
+
static int rtl8169_led_configuration(struct rtl8169_private *tp)
{
u32 led_data;
@@ -3724,6 +3740,7 @@ static void rtl_hw_start_8125b(struct rt
rtl_ephy_init(tp, e_info_8125b);
rtl_hw_start_8125_common(tp);
dev = devm_alloc_etherdev(&pdev->dev, sizeof (*tp));
if (!dev)
return -ENOMEM;
+ rtl8169_devname_configuration(tp);
rtl8169_led_configuration(tp);
rtl_hw_aspm_clkreq_enable(tp, true);
+ if (devname)
+ strlcpy(dev->name, devname, IFNAMSIZ);
+
SET_NETDEV_DEV(dev, &pdev->dev);
dev->netdev_ops = &rtl_netdev_ops;
tp = netdev_priv(dev);