kernel: bump 5.18 to 5.18.12

Signed-off-by: Boos4721 <[email protected]>
Boos4721 · Jul 23, 2022 · 5852360 · 5852360
1 parent 7a06bae
commit 5852360
Show file tree

Hide file tree

Showing 4 changed files with 2,123 additions and 8,332 deletions.
diff --git a/include/kernel-5.18.mk b/include/kernel-5.18.mk
@@ -1,2 +1,2 @@
-LINUX_VERSION-5.18 = .11
-LINUX_KERNEL_HASH-5.18.11 = e20d8e54a782f7079b22762e8ee8adec0d08351b1083553adb2d6885ad1815af
+LINUX_VERSION-5.18 = .12
+LINUX_KERNEL_HASH-5.18.12 = 40b74d0942f255da07481710e1083412d06e37e45b8f9d9e34ae856db37b9527
diff --git a/package/lean/default-settings/files/zzz-default-settings b/package/lean/default-settings/files/zzz-default-settings
@@ -41,7 +41,7 @@ sed -i '/option disabled/d' /etc/config/wireless
 sed -i '/set wireless.radio${devidx}.disabled/d' /lib/wifi/mac80211.sh
 
 sed -i '/DISTRIB_REVISION/d' /etc/openwrt_release
-echo "DISTRIB_REVISION='R22.6.18 '" >> /etc/openwrt_release
+echo "DISTRIB_REVISION='R22.8.15 '" >> /etc/openwrt_release
 sed -i '/DISTRIB_DESCRIPTION/d' /etc/openwrt_release
 echo "DISTRIB_DESCRIPTION='OpenWrt '" >> /etc/openwrt_release
 

diff --git a/target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch b/target/linux/rockchip/patches-5.18/801-fix-stmmac_mdio.patch
@@ -11,9 +11,23 @@
  	if (priv->plat->phy_node || mdio_node)
  		goto bus_register_done;
 
+--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
++++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c
+@@ -498,6 +498,11 @@ int stmmac_mdio_register(struct net_devi
+ 	if (priv->plat->has_xgmac)
+ 		stmmac_xgmac2_mdio_read(new_bus, 0, MII_ADDR_C45);
+
++		stmmac_mdio_write(new_bus,0,31,2627);
++		stmmac_mdio_write(new_bus,0,25,0x1801);
++		stmmac_mdio_write(new_bus,0,31,0);
++		stmmac_mdio_write(new_bus,0,0,0x8000);
++
+ 	if (priv->plat->phy_node || mdio_node)
+ 		goto bus_register_done;
+
 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
 +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
-@@ -2907,6 +2907,8 @@ static int stmmac_init_dma_engine(struct
+@@ -2852,6 +2852,8 @@ static int stmmac_init_dma_engine(struct
  	if (priv->extend_desc && (priv->mode == STMMAC_RING_MODE))
  		atds = 1;