Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
tbblgm119
lede
提交
f8035eb8
L
lede
项目概览
tbblgm119
/
lede
与 Fork 源项目一致
从无法访问的项目Fork
通知
7
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
lede
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
f8035eb8
编写于
12月 21, 2020
作者:
B
Beginner
提交者:
GitHub
12月 21, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
kernel: bump 5.4 to 5.4.84 (#6066)
上级
674cf231
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
8 addition
and
8 deletion
+8
-8
include/kernel-version.mk
include/kernel-version.mk
+2
-2
target/linux/layerscape/patches-5.4/701-net-0149-soc-fsl-dpio-change-CENA-regs-to-be-cacheable.patch
...-0149-soc-fsl-dpio-change-CENA-regs-to-be-cacheable.patch
+2
-2
target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch
...LK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch
+1
-1
target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch
...4-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch
+2
-2
target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch
...arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch
+1
-1
未找到文件。
include/kernel-version.mk
浏览文件 @
f8035eb8
...
@@ -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
=
.8
3
LINUX_VERSION-5.4
=
.8
4
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.8
3
=
beec970bbb93de8ab839f27930f7ab00c7bd65af0ffa07a50e765affdc2561c6
LINUX_KERNEL_HASH-5.4.8
4
=
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)
))))))
...
...
target/linux/layerscape/patches-5.4/701-net-0149-soc-fsl-dpio-change-CENA-regs-to-be-cacheable.patch
浏览文件 @
f8035eb8
...
@@ -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]),
@@ -21
4,7 +217
,7 @@
static int dpaa2_dpio_probe(struct fsl_m
@@ -21
1,7 +214
,7 @@
static int dpaa2_dpio_probe(struct fsl_m
}
}
if (IS_ERR(desc.regs_cena)) {
if (IS_ERR(desc.regs_cena)) {
...
...
target/linux/layerscape/patches-5.4/817-spi-0003-MLK-21960-1-spi-fspi-enable-fspi-on-imx8qxp-and-imx8.patch
浏览文件 @
f8035eb8
...
@@ -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;
@@ -10
76,6 +1092
,8 @@
static int nxp_fspi_resume(struct device
@@ -10
83,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, },
...
...
target/linux/layerscape/patches-5.4/817-spi-0004-MLK-21960-2-spi-fspi-dynamically-alloc-AHB-memory.patch
浏览文件 @
f8035eb8
...
@@ -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);
@@ -99
2,9 +1018
,8 @@
static int nxp_fspi_probe(struct platfor
@@ -99
9,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;
}
}
@@ -10
73,6 +1098
,9 @@
static int nxp_fspi_remove(struct platfo
@@ -10
80,6 +1105
,9 @@
static int nxp_fspi_remove(struct platfo
mutex_destroy(&f->lock);
mutex_destroy(&f->lock);
...
...
target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch
浏览文件 @
f8035eb8
...
@@ -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
@@ -2
88,6 +288
,7 @@
@@ -2
91,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.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录