From: Sasha Levin Date: Wed, 31 Oct 2018 14:06:57 +0000 (-0400) Subject: queue mtd-spi-nor-add-support-for-is25wp-series-chips.patch X-Git-Tag: v4.19.1~32 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=29d8a288276b77c1634687d22133d98e8312c025;p=thirdparty%2Fkernel%2Fstable-queue.git queue mtd-spi-nor-add-support-for-is25wp-series-chips.patch Signed-off-by: Sasha Levin --- diff --git a/queue-4.14/mtd-spi-nor-add-support-for-is25wp-series-chips.patch b/queue-4.14/mtd-spi-nor-add-support-for-is25wp-series-chips.patch new file mode 100644 index 00000000000..5cd1f6c9937 --- /dev/null +++ b/queue-4.14/mtd-spi-nor-add-support-for-is25wp-series-chips.patch @@ -0,0 +1,39 @@ +From a98034af5e776dabd9cea40ef15842e0ea81be51 Mon Sep 17 00:00:00 2001 +From: Kimmo Rautkoski +Date: Sat, 20 Oct 2018 22:44:42 +0300 +Subject: mtd: spi-nor: Add support for is25wp series chips + +[ Upstream commit d616f81cdd2a21edfa90a595a4e9b143f5ba8414 ] + +Added support for is25wp032, is25wp064 and is25wp128. + +Signed-off-by: Kimmo Rautkoski +Reviewed-by: Marek Vasut +Signed-off-by: Boris Brezillon +[ Adrian Bunk: Trivial adaption to changed context. ] +Signed-off-by: Adrian Bunk +Signed-off-by: Sasha Levin +--- + drivers/mtd/spi-nor/spi-nor.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c +index 19c000722cbc..34ecc12ee3d9 100644 +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -1005,6 +1005,12 @@ static const struct flash_info spi_nor_ids[] = { + + /* ISSI */ + { "is25cd512", INFO(0x7f9d20, 0, 32 * 1024, 2, SECT_4K) }, ++ { "is25wp032", INFO(0x9d7016, 0, 64 * 1024, 64, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "is25wp064", INFO(0x9d7017, 0, 64 * 1024, 128, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "is25wp128", INFO(0x9d7018, 0, 64 * 1024, 256, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + + /* Macronix */ + { "mx25l512e", INFO(0xc22010, 0, 64 * 1024, 1, SECT_4K) }, +-- +2.17.1 + diff --git a/queue-4.14/series b/queue-4.14/series index d03afae217c..d49422479f8 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -104,3 +104,4 @@ net-ena-fix-null-dereference-due-to-untimely-napi-in.patch selftests-rtnetlink.sh-explicitly-requires-bash.patch fs-fat-fatent.c-add-cond_resched-to-fat_count_free_c.patch sch_netem-restore-skb-dev-after-dequeuing-from-the-r.patch +mtd-spi-nor-add-support-for-is25wp-series-chips.patch diff --git a/queue-4.4/mtd-spi-nor-add-support-for-is25wp-series-chips.patch b/queue-4.4/mtd-spi-nor-add-support-for-is25wp-series-chips.patch new file mode 100644 index 00000000000..3cd41c04247 --- /dev/null +++ b/queue-4.4/mtd-spi-nor-add-support-for-is25wp-series-chips.patch @@ -0,0 +1,39 @@ +From 3a4eb55f30b53aca8de20fe807a2eb17ec7bd657 Mon Sep 17 00:00:00 2001 +From: Kimmo Rautkoski +Date: Sat, 20 Oct 2018 22:44:42 +0300 +Subject: mtd: spi-nor: Add support for is25wp series chips + +[ Upstream commit d616f81cdd2a21edfa90a595a4e9b143f5ba8414 ] + +Added support for is25wp032, is25wp064 and is25wp128. + +Signed-off-by: Kimmo Rautkoski +Reviewed-by: Marek Vasut +Signed-off-by: Boris Brezillon +[ Adrian Bunk: Trivial adaption to changed context. ] +Signed-off-by: Adrian Bunk +Signed-off-by: Sasha Levin +--- + drivers/mtd/spi-nor/spi-nor.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c +index 64d6f053c2a5..276998ea0267 100644 +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -708,6 +708,12 @@ static const struct flash_info spi_nor_ids[] = { + + /* ISSI */ + { "is25cd512", INFO(0x7f9d20, 0, 32 * 1024, 2, SECT_4K) }, ++ { "is25wp032", INFO(0x9d7016, 0, 64 * 1024, 64, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "is25wp064", INFO(0x9d7017, 0, 64 * 1024, 128, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "is25wp128", INFO(0x9d7018, 0, 64 * 1024, 256, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + + /* Macronix */ + { "mx25l512e", INFO(0xc22010, 0, 64 * 1024, 1, SECT_4K) }, +-- +2.17.1 + diff --git a/queue-4.4/series b/queue-4.4/series index d3d09fd309a..ec4223967c3 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -84,3 +84,4 @@ igb-remove-superfluous-reset-to-phy-and-page-0-selec.patch mips-dec-fix-an-int-handler.s-cpu_daddi_workarounds-.patch arm-dts-imx53-qsb-disable-1.2ghz-opp.patch fs-fat-fatent.c-add-cond_resched-to-fat_count_free_c.patch +mtd-spi-nor-add-support-for-is25wp-series-chips.patch diff --git a/queue-4.9/mtd-spi-nor-add-support-for-is25wp-series-chips.patch b/queue-4.9/mtd-spi-nor-add-support-for-is25wp-series-chips.patch new file mode 100644 index 00000000000..50c0c514e0d --- /dev/null +++ b/queue-4.9/mtd-spi-nor-add-support-for-is25wp-series-chips.patch @@ -0,0 +1,39 @@ +From 8c5813ef02186381333675a9422049af7bdeb21d Mon Sep 17 00:00:00 2001 +From: Kimmo Rautkoski +Date: Sat, 20 Oct 2018 22:44:42 +0300 +Subject: mtd: spi-nor: Add support for is25wp series chips + +[ Upstream commit d616f81cdd2a21edfa90a595a4e9b143f5ba8414 ] + +Added support for is25wp032, is25wp064 and is25wp128. + +Signed-off-by: Kimmo Rautkoski +Reviewed-by: Marek Vasut +Signed-off-by: Boris Brezillon +[ Adrian Bunk: Trivial adaption to changed context. ] +Signed-off-by: Adrian Bunk +Signed-off-by: Sasha Levin +--- + drivers/mtd/spi-nor/spi-nor.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c +index 21dde5249085..c42523b7d5ed 100644 +--- a/drivers/mtd/spi-nor/spi-nor.c ++++ b/drivers/mtd/spi-nor/spi-nor.c +@@ -858,6 +858,12 @@ static const struct flash_info spi_nor_ids[] = { + + /* ISSI */ + { "is25cd512", INFO(0x7f9d20, 0, 32 * 1024, 2, SECT_4K) }, ++ { "is25wp032", INFO(0x9d7016, 0, 64 * 1024, 64, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "is25wp064", INFO(0x9d7017, 0, 64 * 1024, 128, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, ++ { "is25wp128", INFO(0x9d7018, 0, 64 * 1024, 256, ++ SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, + + /* Macronix */ + { "mx25l512e", INFO(0xc22010, 0, 64 * 1024, 1, SECT_4K) }, +-- +2.17.1 + diff --git a/queue-4.9/series b/queue-4.9/series index a44cb168215..a048c0c6e0c 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -130,3 +130,4 @@ rxrpc-don-t-check-rxrpc_call_tx_last-after-calling-r.patch rxrpc-only-take-the-rwind-and-mtu-values-from-latest.patch net-ena-fix-null-dereference-due-to-untimely-napi-in.patch fs-fat-fatent.c-add-cond_resched-to-fat_count_free_c.patch +mtd-spi-nor-add-support-for-is25wp-series-chips.patch