diff --git a/package/kernel/r8125/Makefile b/package/kernel/r8125/Makefile index 71556c0384..4420b12b3f 100644 --- a/package/kernel/r8125/Makefile +++ b/package/kernel/r8125/Makefile @@ -8,7 +8,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=r8125 PKG_VERSION:=9.013.02-2 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/awesometic/realtek-r8125-dkms/tar.gz/$(PKG_VERSION)? diff --git a/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch b/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch index 5fb3f941ac..c11c66a482 100644 --- a/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch +++ b/package/kernel/r8125/patches/100-add-LED-configuration-from-OF.patch @@ -8,23 +8,25 @@ #include #include #include -@@ -13626,6 +13627,23 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri +@@ -13626,6 +13627,25 @@ rtl8125_setup_mqs_reg(struct rtl8125_pri tp->imr_reg[i] = (u16)(IMR1_8125 + (i - 1) * 4); } +static int +rtl8125_led_configuration(struct rtl8125_private *tp) +{ -+ u32 led_data; -+ int ret; ++ const int led_regs[] = { 0x18, 0x86, 0x84, 0x96 }; /* LEDSEL 0-3 */ ++ u32 led_data[4]; ++ int ret, i; + -+ ret = of_property_read_u32(tp->pci_dev->dev.of_node, -+ "realtek,led-data", &led_data); ++ ret = of_property_read_u32_array(tp->pci_dev->dev.of_node, ++ "realtek,led-data", led_data, 4); + + if (ret) + return ret; + -+ RTL_W16(tp, CustomLED, led_data); ++ for (i = 0; i < 4; i++) ++ RTL_W16(tp, led_regs[i], led_data[i]); + + return 0; +} @@ -32,7 +34,7 @@ static void rtl8125_init_software_variable(struct net_device *dev) { -@@ -14260,6 +14278,8 @@ rtl8125_init_software_variable(struct ne +@@ -14260,6 +14280,8 @@ rtl8125_init_software_variable(struct ne else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) tp->rtl8125_rx_config &= ~EnableRxDescV4_1; diff --git a/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch b/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch index 48f9917494..80c0542ad8 100644 --- a/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch +++ b/package/kernel/r8125/patches/110-add-devname-configuration-from-OF.patch @@ -23,8 +23,8 @@ +static int rtl8125_led_configuration(struct rtl8125_private *tp) { - u32 led_data; -@@ -14278,6 +14295,7 @@ rtl8125_init_software_variable(struct ne + const int led_regs[] = { 0x18, 0x86, 0x84, 0x96 }; /* LEDSEL 0-3 */ +@@ -14280,6 +14297,7 @@ rtl8125_init_software_variable(struct ne else if (tp->InitRxDescType == RX_DESC_RING_TYPE_4) tp->rtl8125_rx_config &= ~EnableRxDescV4_1;