kernel: bump 5.4 to 5.4.225

All patches automatically rebased.

Signed-off-by: Linhui Liu <liulinhui36@gmail.com>
This commit is contained in:
Linhui Liu 2022-11-26 13:50:27 +08:00 committed by aiamadeus
parent fc33fa6e5f
commit 0b241584b5
7 changed files with 15 additions and 15 deletions

View File

@ -1,2 +1,2 @@
LINUX_VERSION-5.4 = .224 LINUX_VERSION-5.4 = .225
LINUX_KERNEL_HASH-5.4.224 = 8b7df25b5560620eb2776d7b7c67569764b3916ff2f596767f72567b38d13d36 LINUX_KERNEL_HASH-5.4.225 = 59f596f6714317955cf481590babcf015aff2bc1900bd8e8dc8f7af73bc560aa

View File

@ -766,7 +766,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* bring up the dma engine and IP core */ /* bring up the dma engine and IP core */
--- a/drivers/net/ethernet/marvell/mv643xx_eth.c --- a/drivers/net/ethernet/marvell/mv643xx_eth.c
+++ b/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2705,7 +2705,6 @@ static int mv643xx_eth_shared_of_add_por @@ -2706,7 +2706,6 @@ static int mv643xx_eth_shared_of_add_por
struct platform_device *ppdev; struct platform_device *ppdev;
struct mv643xx_eth_platform_data ppd; struct mv643xx_eth_platform_data ppd;
struct resource res; struct resource res;
@ -774,7 +774,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int ret; int ret;
int dev_num = 0; int dev_num = 0;
@@ -2736,9 +2735,7 @@ static int mv643xx_eth_shared_of_add_por @@ -2737,9 +2736,7 @@ static int mv643xx_eth_shared_of_add_por
return -EINVAL; return -EINVAL;
} }
@ -1362,7 +1362,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/ethernet/ti/cpsw.c --- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c
@@ -2555,7 +2555,6 @@ static int cpsw_probe_dt(struct cpsw_pla @@ -2557,7 +2557,6 @@ static int cpsw_probe_dt(struct cpsw_pla
for_each_available_child_of_node(node, slave_node) { for_each_available_child_of_node(node, slave_node) {
struct cpsw_slave_data *slave_data = data->slave_data + i; struct cpsw_slave_data *slave_data = data->slave_data + i;
@ -1370,7 +1370,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
int lenp; int lenp;
const __be32 *parp; const __be32 *parp;
@@ -2628,10 +2627,8 @@ static int cpsw_probe_dt(struct cpsw_pla @@ -2630,10 +2629,8 @@ static int cpsw_probe_dt(struct cpsw_pla
} }
no_phy_slave: no_phy_slave:

View File

@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
/* Align . to a 8 byte boundary equals to maximum function alignment. */ /* Align . to a 8 byte boundary equals to maximum function alignment. */
#define ALIGN_FUNCTION() . = ALIGN(8) #define ALIGN_FUNCTION() . = ALIGN(8)
@@ -407,14 +417,14 @@ @@ -408,14 +418,14 @@
/* Kernel symbol table: Normal symbols */ \ /* Kernel symbol table: Normal symbols */ \
__ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \
__start___ksymtab = .; \ __start___ksymtab = .; \
@ -47,7 +47,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
__stop___ksymtab_gpl = .; \ __stop___ksymtab_gpl = .; \
} \ } \
\ \
@@ -476,7 +486,7 @@ @@ -477,7 +487,7 @@
\ \
/* Kernel symbol table: strings */ \ /* Kernel symbol table: strings */ \
__ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \

View File

@ -11,7 +11,7 @@ Submitted-by: Langhua Ye <y1248289414@outlook.com>
--- a/drivers/mtd/spi-nor/spi-nor.c --- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -2565,6 +2565,7 @@ @@ -2566,6 +2566,7 @@ static const struct flash_info spi_nor_i
/* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */ /* XMC (Wuhan Xinxin Semiconductor Manufacturing Corp.) */
{ "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH64A", INFO(0x207017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
{ "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "XM25QH128A", INFO(0x207018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },

View File

@ -90,7 +90,7 @@
#endif #endif
--- a/drivers/net/tun.c --- a/drivers/net/tun.c
+++ b/drivers/net/tun.c +++ b/drivers/net/tun.c
@@ -2873,6 +2873,8 @@ static int tun_set_iff(struct net *net, @@ -2881,6 +2881,8 @@ static int tun_set_iff(struct net *net,
~(NETIF_F_HW_VLAN_CTAG_TX | ~(NETIF_F_HW_VLAN_CTAG_TX |
NETIF_F_HW_VLAN_STAG_TX); NETIF_F_HW_VLAN_STAG_TX);

View File

@ -64,9 +64,9 @@ Reviewed-by: Peter Chen <peter.chen@nxp.com>
--- a/drivers/usb/dwc3/host.c --- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c
@@ -16,6 +16,44 @@ static const struct xhci_plat_priv dwc3_ @@ -11,6 +11,44 @@
.quirks = XHCI_SKIP_PHY_INIT,
}; #include "core.h"
+#define XHCI_HCSPARAMS1 0x4 +#define XHCI_HCSPARAMS1 0x4
+#define XHCI_PORTSC_BASE 0x400 +#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) static int dwc3_host_get_irq(struct dwc3 *dwc)
{ {
struct platform_device *dwc3_pdev = to_platform_device(dwc->dev); 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); struct platform_device *dwc3_pdev = to_platform_device(dwc->dev);
int prop_idx = 0; int prop_idx = 0;

View File

@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
--- a/drivers/mmc/core/core.c --- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c
@@ -1371,6 +1371,8 @@ void mmc_power_off(struct mmc_host *host @@ -1377,6 +1377,8 @@ void mmc_power_off(struct mmc_host *host
mmc_pwrseq_power_off(host); mmc_pwrseq_power_off(host);