fish/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>
This commit is contained in:
Tianling Shen 2024-05-10 19:52:48 +08:00
parent 7376941a97
commit 07900bc830
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
1 changed files with 16 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,33 +1,20 @@
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -2206,6 +2206,22 @@ void r8169_apply_firmware(struct rtl8169
}
}
@@ -5260,6 +5260,7 @@ 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);
u32 txconfig;
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;
@@ -3714,6 +3730,7 @@ static void rtl_hw_start_8125b(struct rt
rtl_set_def_aspm_entry_latency(tp);
rtl_ephy_init(tp, e_info_8125b);
rtl_hw_start_8125_common(tp);
+ rtl8169_devname_configuration(tp);
rtl8169_led_configuration(tp);
}
@@ -5267,6 +5268,9 @@ static int rtl_init_one(struct pci_dev *
if (!dev)
return -ENOMEM;
+ if (devname)
+ strlcpy(dev->name, devname, IFNAMSIZ);
+
SET_NETDEV_DEV(dev, &pdev->dev);
dev->netdev_ops = &rtl_netdev_ops;
tp = netdev_priv(dev);