未验证 提交 f8035eb8 编写于 作者: B Beginner 提交者: GitHub

kernel: bump 5.4 to 5.4.84 (#6066)

上级 674cf231
...@@ -8,11 +8,11 @@ endif ...@@ -8,11 +8,11 @@ endif
LINUX_VERSION-4.14 = .195 LINUX_VERSION-4.14 = .195
LINUX_VERSION-4.19 = .138 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.14.195 = 394f28798670240baacd9e2cce521fbd79f8da5e1fc191695b0e11381445a021
LINUX_KERNEL_HASH-4.19.138 = d15c27d05f6c527269b75b30cc72972748e55720e7e00ad8abbaa4fe3b1d5e02 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)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1))))))) sanitize_uri=$(call qstrip,$(subst @,_,$(subst :,_,$(subst .,_,$(subst -,_,$(subst /,_,$(1)))))))
......
...@@ -32,7 +32,7 @@ Signed-off-by: Haiying Wang <Haiying.Wang@nxp.com> ...@@ -32,7 +32,7 @@ Signed-off-by: Haiying Wang <Haiying.Wang@nxp.com>
struct dpio_priv { struct dpio_priv {
struct dpaa2_io *io; 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) { if (dpio_dev->obj_desc.region_count < 3) {
/* No support for DDR backed portals, use classic mapping */ /* No support for DDR backed portals, use classic mapping */
/* /*
...@@ -50,7 +50,7 @@ Signed-off-by: Haiying Wang <Haiying.Wang@nxp.com> ...@@ -50,7 +50,7 @@ Signed-off-by: Haiying Wang <Haiying.Wang@nxp.com>
} else { } else {
desc.regs_cena = devm_memremap(dev, dpio_dev->regions[2].start, desc.regs_cena = devm_memremap(dev, dpio_dev->regions[2].start,
resource_size(&dpio_dev->regions[2]), 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)) { if (IS_ERR(desc.regs_cena)) {
......
...@@ -35,7 +35,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com> ...@@ -35,7 +35,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com>
struct nxp_fspi { struct nxp_fspi {
void __iomem *iobase; void __iomem *iobase;
void __iomem *ahb_addr; 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[] = { static const struct of_device_id nxp_fspi_dt_ids[] = {
{ .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, }, { .compatible = "nxp,lx2160a-fspi", .data = (void *)&lx2160a_data, },
......
...@@ -76,7 +76,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com> ...@@ -76,7 +76,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com>
} else { } else {
if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT) if (op->data.nbytes && op->data.dir == SPI_MEM_DATA_OUT)
nxp_fspi_fill_txfifo(f, op); 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 */ /* find the resources - controller memory mapped space */
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "fspi_mmap");
...@@ -88,7 +88,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com> ...@@ -88,7 +88,7 @@ Signed-off-by: Han Xu <han.xu@nxp.com>
goto err_put_ctrl; 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); mutex_destroy(&f->lock);
......
...@@ -44,7 +44,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de> ...@@ -44,7 +44,7 @@ Signed-off-by: Heiko Stuebner <heiko@sntech.de>
mdio { mdio {
--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+++ b/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>; resets = <&cru SRST_A_GMAC>;
reset-names = "stmmaceth"; reset-names = "stmmaceth";
rockchip,grf = <&grf>; rockchip,grf = <&grf>;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册