From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Sun, 27 Nov 2022 14:34:18 +0000 (+0100)
Subject: kernel: bump 5.4 to 5.4.224
X-Git-Tag: v21.02.6~130
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e506a0d50fed3d7e3ae2b88682b1d8e94efa9805;p=openwrt%2Fstaging%2Fhauke.git

kernel: bump 5.4 to 5.4.224

Compile-tested: x86/64
Run-tested: x86/64

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 9b8325db0a..7480663923 100644
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,9 +6,9 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .224
+LINUX_VERSION-5.4 = .225
 
-LINUX_KERNEL_HASH-5.4.224 = 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36
+LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
 sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
diff --git a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
index 34ad1be438..e688302597 100644
--- a/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
+++ b/target/linux/bcm27xx/patches-5.4/950-0043-MMC-added-alternative-MMC-driver.patch
@@ -267,7 +267,7 @@ Signed-off-by: Yaroslav Rosomakho <yaroslavros@gmail.com>
  		goto out;
 --- a/drivers/mmc/core/core.c
 +++ b/drivers/mmc/core/core.c
-@@ -1925,7 +1925,8 @@ EXPORT_SYMBOL(mmc_erase);
+@@ -1931,7 +1931,8 @@ EXPORT_SYMBOL(mmc_erase);
  int mmc_can_erase(struct mmc_card *card)
  {
  	if ((card->host->caps & MMC_CAP_ERASE) &&
diff --git a/target/linux/generic/hack-5.4/221-module_exports.patch b/target/linux/generic/hack-5.4/221-module_exports.patch
index 47f40ac5e1..446bf53008 100644
--- a/target/linux/generic/hack-5.4/221-module_exports.patch
+++ b/target/linux/generic/hack-5.4/221-module_exports.patch
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  /* Align . to a 8 byte boundary equals to maximum function alignment. */
  #define ALIGN_FUNCTION()  . = ALIGN(8)
  
-@@ -407,14 +417,14 @@
+@@ -408,14 +418,14 @@
  	/* Kernel symbol table: Normal symbols */			\
  	__ksymtab         : AT(ADDR(__ksymtab) - LOAD_OFFSET) {		\
  		__start___ksymtab = .;					\
@@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  		__stop___ksymtab_gpl = .;				\
  	}								\
  									\
-@@ -476,7 +486,7 @@
+@@ -477,7 +487,7 @@
  									\
  	/* Kernel symbol table: strings */				\
          __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) {	\
diff --git a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
index a5b84f3db9..0e2942a3bc 100644
--- a/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
+++ b/target/linux/layerscape/patches-5.4/820-usb-0009-usb-dwc3-Add-workaround-for-host-mode-VBUS-glitch-wh.patch
@@ -64,9 +64,9 @@ Reviewed-by: Peter Chen <peter.chen@nxp.com>
  
 --- a/drivers/usb/dwc3/host.c
 +++ b/drivers/usb/dwc3/host.c
-@@ -16,6 +16,44 @@ static const struct xhci_plat_priv dwc3_
- 	.quirks = XHCI_SKIP_PHY_INIT,
- };
+@@ -11,6 +11,44 @@
+ 
+ #include "core.h"
  
 +#define XHCI_HCSPARAMS1		0x4
 +#define XHCI_PORTSC_BASE	0x400
@@ -109,7 +109,7 @@ Reviewed-by: Peter Chen <peter.chen@nxp.com>
  static int dwc3_host_get_irq(struct dwc3 *dwc)
  {
  	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);
-@@ -55,6 +93,13 @@ int dwc3_host_init(struct dwc3 *dwc)
+@@ -50,6 +88,13 @@ int dwc3_host_init(struct dwc3 *dwc)
  	struct platform_device	*dwc3_pdev = to_platform_device(dwc->dev);
  	int			prop_idx = 0;
  
diff --git a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch
index 64b556088d..a25c845ffc 100644
--- a/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch
+++ b/target/linux/mediatek/patches-5.4/0900-bt-mtk-serial-fix.patch
@@ -19,7 +19,7 @@
  	},
  	[PORT_NPCM] = {
  		.name		= "Nuvoton 16550",
-@@ -2612,6 +2612,11 @@ serial8250_do_set_termios(struct uart_po
+@@ -2615,6 +2615,11 @@ serial8250_do_set_termios(struct uart_po
  	unsigned long flags;
  	unsigned int baud, quot, frac = 0;