diff options
| author | John Audia <graysky@archlinux.us> | 2021-07-25 14:36:53 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-07-31 19:13:00 +0200 |
| commit | 28ef76402671c4166de2d34e52dbc4f46dc08077 (patch) | |
| tree | 5446f5736584ae498e7b7671c837c58035d96dc4 /target/linux/mediatek | |
| parent | f038a169a0341f4212997f02de2b280ea1178f9e (diff) | |
| download | upstream-28ef76402671c4166de2d34e52dbc4f46dc08077.tar.gz upstream-28ef76402671c4166de2d34e52dbc4f46dc08077.tar.bz2 upstream-28ef76402671c4166de2d34e52dbc4f46dc08077.zip | |
kernel: bump 5.4 to 5.4.135
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/mediatek')
| -rw-r--r-- | target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch | 4 | ||||
| -rw-r--r-- | target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch b/target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch index 2a23f8c3dc..4cef9f9d5e 100644 --- a/target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch +++ b/target/linux/mediatek/patches-5.4/0310-mtk-bmt-support.patch @@ -797,7 +797,7 @@ static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val) { -@@ -1099,6 +1100,8 @@ static int spinand_probe(struct spi_mem +@@ -1100,6 +1101,8 @@ static int spinand_probe(struct spi_mem if (ret) return ret; @@ -806,7 +806,7 @@ ret = mtd_device_register(mtd, NULL, 0); if (ret) goto err_spinand_cleanup; -@@ -1124,6 +1127,7 @@ static int spinand_remove(struct spi_mem +@@ -1125,6 +1128,7 @@ static int spinand_remove(struct spi_mem if (ret) return ret; diff --git a/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch b/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch index e75d76b9cc..3d62f40544 100644 --- a/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch +++ b/target/linux/mediatek/patches-5.4/1011-net-ethernet-mtk_eth_soc-add-support-for-coherent-DM.patch @@ -51,7 +51,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628)) { ret = device_reset(eth->dev); if (ret) { -@@ -3104,6 +3112,16 @@ static int mtk_probe(struct platform_dev +@@ -3106,6 +3114,16 @@ static int mtk_probe(struct platform_dev } } |