Merge pull request #139 from openwrtdiy/openwrt-23.05

Synchronize official source code
openwrtdiy · Nov 6, 2024 · 17c08e2 · 17c08e2
2 parents 73b6f41 + e70669e
commit 17c08e2
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 73 deletions.
diff --git a/package/kernel/r8126/Makefile b/package/kernel/r8126/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=r8126
-PKG_VERSION:=10.013.00
-PKG_RELEASE:=4
+PKG_VERSION:=10.014.01
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://github.com/openwrt/rtl8126/releases/download/$(PKG_VERSION)
-PKG_HASH:=b41bda6ff3bbb7d9bc5b81c5c21355f031587d3a3a5862abcd4d766e942272e7
+PKG_HASH:=dbb10a7abd0972e4abd1b89ea4eb22fc55d6c1dc2f711b5acf4a3bc376275e21
 
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPLv2

diff --git a/package/kernel/r8126/patches/001-r8126.h-use-BIT_ULL.patch b/package/kernel/r8126/patches/001-r8126.h-use-BIT_ULL.patch
diff --git a/package/kernel/r8126/patches/100-r8126_rss-silence-rxnfc-log.patch b/package/kernel/r8126/patches/100-r8126_rss-silence-rxnfc-log.patch
diff --git a/package/kernel/r8126/patches/200-r8126-print-link-speed-and-duplex-mode.patch b/package/kernel/r8126/patches/200-r8126-print-link-speed-and-duplex-mode.patch
@@ -18,7 +18,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 
 --- a/src/r8126.h
 +++ b/src/r8126.h
-@@ -1561,6 +1561,8 @@ enum RTL8126_register_content {
+@@ -1740,6 +1740,8 @@ enum RTL8126_register_content {
          LinkStatus = 0x02,
          FullDup = 0x01,
 
@@ -37,7 +37,7 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
  #include <linux/delay.h>
-@@ -4740,6 +4741,40 @@ rtl8126_link_down_patch(struct net_devic
+@@ -4744,6 +4745,40 @@ rtl8126_link_down_patch(struct net_devic
  #endif
  }
 
@@ -76,10 +76,10 @@ Signed-off-by: Álvaro Fernández Rojas <[email protected]>
 +}
 +
  static void
- _rtl8126_check_link_status(struct net_device *dev)
+ _rtl8126_check_link_status(struct net_device *dev, unsigned int link_state)
  {
-@@ -4748,11 +4783,18 @@ _rtl8126_check_link_status(struct net_de
-         if (tp->link_ok(dev)) {
+@@ -4756,11 +4791,18 @@ _rtl8126_check_link_status(struct net_de
+         if (link_state == R8126_LINK_STATE_ON) {
                  rtl8126_link_on_patch(dev);
 
 -                if (netif_msg_ifup(tp))

diff --git a/package/kernel/r8168/Makefile b/package/kernel/r8168/Makefile
@@ -1,12 +1,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=r8168
-PKG_VERSION:=8.053.00
-PKG_RELEASE:=2
+PKG_VERSION:=8.054.00
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://github.com/openwrt/rtl8168/releases/download/$(PKG_VERSION)
-PKG_HASH:=52f1e6200672b598a04d4ac21ac92a8a9e128b38208c7b03a464bfa93bbfcc8f
+PKG_HASH:=5480120cf823e991e8cbd325118c1ec0c57d8f42760ba1a7334bd07d291d235d
 
 PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPLv2

diff --git a/package/kernel/r8168/patches/200-r8168-print-link-speed-and-duplex-mode.patch b/package/kernel/r8168/patches/200-r8168-print-link-speed-and-duplex-mode.patch
@@ -18,7 +18,7 @@ Signed-off-by: Chukun Pan <[email protected]>
 
 --- a/src/r8168.h
 +++ b/src/r8168.h
-@@ -1385,6 +1385,8 @@ enum RTL8168_register_content {
+@@ -1468,6 +1468,8 @@ enum RTL8168_register_content {
          LinkStatus = 0x02,
          FullDup = 0x01,
 
@@ -37,7 +37,7 @@ Signed-off-by: Chukun Pan <[email protected]>
  #include <linux/netdevice.h>
  #include <linux/etherdevice.h>
  #include <linux/delay.h>
-@@ -5373,6 +5374,36 @@ rtl8168_link_down_patch(struct net_devic
+@@ -5369,6 +5370,36 @@ rtl8168_link_down_patch(struct net_devic
  #endif
  }
 
@@ -74,7 +74,7 @@ Signed-off-by: Chukun Pan <[email protected]>
  static void
  rtl8168_check_link_status(struct net_device *dev)
  {
-@@ -5392,11 +5423,18 @@ rtl8168_check_link_status(struct net_dev
+@@ -5388,11 +5419,18 @@ rtl8168_check_link_status(struct net_dev
                  if (link_status_on) {
                          rtl8168_link_on_patch(dev);
 

diff --git a/package/system/gpio-cdev/nu801/Makefile b/package/system/gpio-cdev/nu801/Makefile
@@ -3,6 +3,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nu801
+PKG_FLAGS:=nonshared
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git

diff --git a/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8068-mr42.dts b/target/linux/ipq806x/files-5.15/arch/arm/boot/dts/qcom-ipq8068-mr42.dts
@@ -58,7 +58,7 @@
 	phy-mode = "sgmii";
 	phy-handle = <&phy2>;
 
-	nvmem-cells = <&mac_address>;
+	nvmem-cells = <&mac_address 0>;
 	nvmem-cell-names = "mac-address";
 };
 
@@ -84,11 +84,17 @@
 		pagesize = <32>;
 		reg = <0x56>;
 		read-only;
-		#address-cells = <1>;
-		#size-cells = <1>;
 
-		mac_address: mac-address@66 {
-			reg = <0x66 0x6>;
+		nvmem-layout {
+			compatible = "fixed-layout";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			mac_address: mac-address@66 {
+				compatible = "mac-base";
+				reg = <0x66 0x6>;
+				#nvmem-cell-cells = <1>;
+			};
 		};
 	};
 };
@@ -186,21 +192,18 @@
 };
 
 &wifi0 {
-	nvmem-cells = <&mac_address>;
+	nvmem-cells = <&mac_address 1>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <1>;
 };
 
 &wifi1 {
-	nvmem-cells = <&mac_address>;
+	nvmem-cells = <&mac_address 2>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <2>;
 };
 
 &wifi2 {
-	nvmem-cells = <&mac_address>;
+	nvmem-cells = <&mac_address 3>;
 	nvmem-cell-names = "mac-address";
-	mac-address-increment = <3>;
 };
 
 &hs_phy_0 {

diff --git a/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts b/target/linux/mediatek/dts/mt7981b-yuncore-ax835.dts
@@ -36,6 +36,7 @@
 		regulator-name = "led_vbus";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		enable-active-high;
 		regulator-always-on;
 		gpio = <&pio 5 GPIO_ACTIVE_HIGH>;
 	};