aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ipq40xx
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2020-04-17 14:29:33 +0200
committerPetr Štetiar <ynezz@true.cz>2020-04-17 15:18:12 +0200
commit23916bca61435ee80236f6aef70a3f0acacd4a93 (patch)
treeab3dc6705b08a3946a57b33c7f9f4aa835534292 /target/linux/ipq40xx
parent0495324b9bd0b6a976ea731a1b4b77b26df32ee6 (diff)
downloadupstream-23916bca61435ee80236f6aef70a3f0acacd4a93.tar.gz
upstream-23916bca61435ee80236f6aef70a3f0acacd4a93.tar.bz2
upstream-23916bca61435ee80236f6aef70a3f0acacd4a93.zip
kernel: bump 5.4 to 5.4.33
Refreshed patches, removed upstreamed patches: oxnas: 001-irqchip-versatile-fpga-Handle-chained-IRQs-properly.patch oxnas: 002-irqchip-versatile-fpga-Apply-clear-mask-earlier.patch Run tested: qemu-x86-64, apalis Build tested: x86/64, imx6, sunxi/a53 Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/ipq40xx')
-rw-r--r--target/linux/ipq40xx/patches-5.4/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/ipq40xx/patches-5.4/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch b/target/linux/ipq40xx/patches-5.4/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch
index ba0447b20e..d97f94c4a0 100644
--- a/target/linux/ipq40xx/patches-5.4/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch
+++ b/target/linux/ipq40xx/patches-5.4/304-mtd-spi-nor-Add-support-for-mx25r3235f.patch
@@ -15,7 +15,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
--- a/drivers/mtd/spi-nor/spi-nor.c
+++ b/drivers/mtd/spi-nor/spi-nor.c
-@@ -2313,6 +2313,8 @@ static const struct flash_info spi_nor_i
+@@ -2318,6 +2318,8 @@ static const struct flash_info spi_nor_i
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
{ "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },