diff --git a/include/kernel-version.mk b/include/kernel-version.mk index d4db468fe783af9c024668eb50dd95eb18fa8bb9..6b31cd9b17441a8950766fc3a26e1c32e867d291 100644 --- a/include/kernel-version.mk +++ b/include/kernel-version.mk @@ -8,11 +8,11 @@ endif LINUX_VERSION-4.14 = .195 LINUX_VERSION-4.19 = .138 -LINUX_VERSION-5.4 = .83 +LINUX_VERSION-5.4 = .84 LINUX_KERNEL_HASH-4.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021 LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02 -LINUX_KERNEL_HASH-5.4.83 = beec970bbb93de8ab839f27930f7ab00c7bd65af0ffa07a50e765affdc2561c6 +LINUX_KERNEL_HASH-5.4.84 = 0985fcf6cdcebceca63cb70abab66d12e75fac61014a796ce71272b33f831515 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/layerscape/patches-5.4/701-net-0149-soc-fsl-dpio-change-CENA-regs-to-be-cacheable.patch b/target/linux/layerscape/patches-5.4/701-net-0149-soc-fsl-dpio-change-CENA-regs-to-be-cacheable.patch index 34655487dff46945e9c55091041fe7c92d71df62..eba8a12007d67bfa4f54fa625c185237837f0263 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0149-soc-fsl-dpio-change-CENA-regs-to-be-cacheable.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0149-soc-fsl-dpio-change-CENA-regs-to-be-cacheable.patch @@ -32,7 +32,7 @@ Signed-off-by: Haiying Wang struct dpio_priv { struct dpaa2_io *io; }; -@@ -200,13 +205,11 @@ static int dpaa2_dpio_probe(struct fsl_m +@@ -197,13 +202,11 @@ static int dpaa2_dpio_probe(struct fsl_m if (dpio_dev->obj_desc.region_count < 3) { /* No support for DDR backed portals, use classic mapping */ /* @@ -50,7 +50,7 @@ Signed-off-by: Haiying Wang } else { desc.regs_cena = devm_memremap(dev, dpio_dev->regions[2].start, resource_size(&dpio_dev->regions[2]), -@@ -214,7 +217,7 @@ static int dpaa2_dpio_probe(struct fsl_m +@@ -211,7 +214,7 @@ static int dpaa2_dpio_probe(struct fsl_m } if (IS_ERR(desc.regs_cena)) { diff --git a/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch b/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch index 59906dd93daae25d9ec9724346c33b44c4d4875a..07fac213ce3e1b58b6b3ba90a48e231649ef97f3 100644 --- a/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch +++ b/target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch @@ -35,7 +35,7 @@ Signed-off-by: Han Xu struct nxp_fspi { void __iomem *iobase; void __iomem *ahb_addr; -@@ -1076,6 +1092,8 @@ static int nxp_fspi_resume(struct device +@@ -1083,6 +1099,8 @@ static int nxp_fspi_resume(struct device static const struct of_device_id nxp_fspi_dt_ids[] = { { .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, }, diff --git a/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch b/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch index ed8dc301f7a9feb74279574bd1e2676224b8baa3..a8db23cebb5c8d9898d8676bf3bccce48d7f9dce 100644 --- a/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch +++ b/target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch @@ -76,7 +76,7 @@ Signed-off-by: Han Xu } else { if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT) nxp_fspi_fill_txfifo(f, op); -@@ -992,9 +1018,8 @@ static int nxp_fspi_probe(struct platfor +@@ -999,9 +1025,8 @@ static int nxp_fspi_probe(struct platfor /* find the resources - controller memory mapped space */ res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap"); @@ -88,7 +88,7 @@ Signed-off-by: Han Xu goto err_put_ctrl; } -@@ -1073,6 +1098,9 @@ static int nxp_fspi_remove(struct platfo +@@ -1080,6 +1105,9 @@ static int nxp_fspi_remove(struct platfo mutex_destroy(&f->lock); diff --git a/target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch b/target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch index cc90bad6914cf120c1a54dd2fe37d9a6c091ed57..8a33b4bc140c9bb33ee2502765e56b1a8e2c17f9 100644 --- a/target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch +++ b/target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch @@ -44,7 +44,7 @@ Signed-off-by: Heiko Stuebner mdio { --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -288,6 +288,7 @@ +@@ -291,6 +291,7 @@ resets = <&cru SRST_A_GMAC>; reset-names = "stmmaceth"; rockchip,grf = <&grf>;