diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-15 16:21:46 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-15 19:32:20 +0200 |
| commit | 9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff (patch) | |
| tree | 583c92bf887bbd32e6a2ebfae54d888ceb7ba556 /target/linux/bcm63xx/patches-5.4 | |
| parent | c287500a656e43da45b203fb3c4463d9089c5986 (diff) | |
| download | upstream-9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff.tar.gz upstream-9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff.tar.bz2 upstream-9d21eccc6b763a1e2f0a0ed0bcb4561ea0ed68ff.zip | |
kernel: bump 5.4 to 5.4.119
Removed because in upstream
generic/backport-5.4/050-gro-fix-napi_gro_frags-Fast-GRO-breakage-due-to-IP-a.patch
ath79/patches-5.4/0050-spi-ath79-remove-spi-master-setup-and-cleanup-assign.patch
ramips/patches-5.4/999-fix-pci-init-mt7620.patch
Manually rebased
ath79/patches-5.4/0033-spi-ath79-drop-pdata-support.patch
All others updated automatically.
Compile-tested on: x86/64, ath79/generic
Runtime-tested on: x86/64, ath79/generic
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4')
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/026-v5.8-mtd-rawnand-brcmnand-support-v2.1-v2.2-controllers.patch b/target/linux/bcm63xx/patches-5.4/026-v5.8-mtd-rawnand-brcmnand-support-v2.1-v2.2-controllers.patch index b48f4b9b2a..fe86584d0d 100644 --- a/target/linux/bcm63xx/patches-5.4/026-v5.8-mtd-rawnand-brcmnand-support-v2.1-v2.2-controllers.patch +++ b/target/linux/bcm63xx/patches-5.4/026-v5.8-mtd-rawnand-brcmnand-support-v2.1-v2.2-controllers.patch @@ -183,7 +183,7 @@ Link: https://lore.kernel.org/linux-mtd/20200522121524.4161539-6-noltari@gmail.c nand_writereg(ctrl, acc_control_offs, tmp); brcmnand_set_sector_size_1k(host, cfg->sector_size_1k); -@@ -2524,6 +2589,8 @@ const struct dev_pm_ops brcmnand_pm_ops +@@ -2530,6 +2595,8 @@ const struct dev_pm_ops brcmnand_pm_ops EXPORT_SYMBOL_GPL(brcmnand_pm_ops); static const struct of_device_id brcmnand_of_match[] = { diff --git a/target/linux/bcm63xx/patches-5.4/434-nand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch b/target/linux/bcm63xx/patches-5.4/434-nand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch index c3bb1ae1e8..f39beb9980 100644 --- a/target/linux/bcm63xx/patches-5.4/434-nand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch +++ b/target/linux/bcm63xx/patches-5.4/434-nand-brcmnand-fix-OOB-R-W-with-Hamming-ECC.patch @@ -19,9 +19,9 @@ Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c -@@ -2426,6 +2426,12 @@ static int brcmnand_attach_chip(struct n - - ret = brcmstb_choose_ecc_layout(host); +@@ -2432,6 +2432,12 @@ static int brcmnand_attach_chip(struct n + chip->ecc.read_oob = brcmnand_read_oob_raw; + } + /* If OOB is written with ECC enabled it will cause ECC errors */ + if (is_hamming_ecc(host->ctrl, &host->hwcfg)) { |