diff --git a/target/linux/rockchip/patches-5.15/600-net-ethernet-r8169-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-5.15/600-net-ethernet-r8169-add-LED-configuration-from-OF.patch deleted file mode 100644 index d4d78ab4fc..0000000000 --- a/target/linux/rockchip/patches-5.15/600-net-ethernet-r8169-add-LED-configuration-from-OF.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- a/drivers/net/ethernet/realtek/r8169_main.c -+++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -183,6 +184,7 @@ enum rtl_registers { - MAR0 = 8, /* Multicast filter. */ - CounterAddrLow = 0x10, - CounterAddrHigh = 0x14, -+ CustomLED = 0x18, - TxDescStartAddrLow = 0x20, - TxDescStartAddrHigh = 0x24, - TxHDescStartAddrLow = 0x28, -@@ -2143,6 +2145,22 @@ void r8169_apply_firmware(struct rtl8169 - } - } - -+static int rtl8169_led_configuration(struct rtl8169_private *tp) -+{ -+ u32 led_data; -+ int ret; -+ -+ ret = of_property_read_u32(tp->pci_dev->dev.of_node, -+ "realtek,led-data", &led_data); -+ -+ if (ret) -+ return ret; -+ -+ RTL_W16(tp, CustomLED, led_data); -+ -+ return 0; -+} -+ - static void rtl8168_config_eee_mac(struct rtl8169_private *tp) - { - /* Adjust EEE LED frequency */ -@@ -3252,6 +3270,8 @@ static void rtl_hw_start_8168h_1(struct - r8168_mac_ocp_write(tp, 0xc094, 0x0000); - r8168_mac_ocp_write(tp, 0xc09e, 0x0000); - -+ rtl8169_led_configuration(tp); -+ - rtl_hw_aspm_clkreq_enable(tp, true); - } - -@@ -3704,6 +3724,8 @@ static void rtl_hw_start_8125b(struct rt - rtl_ephy_init(tp, e_info_8125b); - rtl_hw_start_8125_common(tp); - -+ rtl8169_led_configuration(tp); -+ - rtl_hw_aspm_clkreq_enable(tp, true); - } - diff --git a/target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch b/target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch index dfe2177ac2..2cb8d8e368 100644 --- a/target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch +++ b/target/linux/rockchip/patches-5.15/602-net-ethernet-r8169-add-devname-configuration-from-OF.patch @@ -1,6 +1,14 @@ --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c -@@ -5333,12 +5333,16 @@ static int rtl_init_one(struct pci_dev * +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -5320,12 +5321,16 @@ static int rtl_init_one(struct pci_dev * int jumbo_max, region, rc; enum mac_version chipset; struct net_device *dev;