81de7648760d1b993a4e46c56a213824a1f28662
[openwrt/staging/ldir.git] / target / linux / generic / pending-6.1 / 498-mtd-spi-nor-locking-support-for-MX25L6405D.patch
1 From 8bf2ce6ea4ee840b70f55a27f80e1cd308051b13 Mon Sep 17 00:00:00 2001
2 From: Nick Hainke <vincent@systemli.org>
3 Date: Mon, 27 Dec 2021 00:38:13 +0100
4 Subject: [PATCH 1/2] mtd: spi-nor: locking support for MX25L6405D
5
6 Macronix MX25L6405D supports locking with four block-protection bits.
7 Currently, the driver only sets three bits. If the bootloader does not
8 sustain the flash chip in an unlocked state, the flash might be
9 non-writeable. Add the corresponding flag to enable locking support with
10 four bits in the status register.
11
12 Tested on Nanostation M2 XM.
13
14 Similar to commit 7ea40b54e83b ("mtd: spi-nor: enable locking support for
15 MX25L12805D")
16
17 Signed-off-by: David Bauer <mail@david-bauer.net>
18 Signed-off-by: Nick Hainke <vincent@systemli.org>
19 ---
20 drivers/mtd/spi-nor/macronix.c | 3 ++-
21 1 file changed, 2 insertions(+), 1 deletion(-)
22
23 --- a/drivers/mtd/spi-nor/macronix.c
24 +++ b/drivers/mtd/spi-nor/macronix.c
25 @@ -41,7 +41,8 @@ static const struct flash_info macronix_
26 { "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, SECT_4K) },
27 { "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) },
28 { "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) },
29 - { "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
30 + { "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K |
31 + SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP) },
32 { "mx25u2033e", INFO(0xc22532, 0, 64 * 1024, 4, SECT_4K) },
33 { "mx25u3235f", INFO(0xc22536, 0, 64 * 1024, 64,
34 SECT_4K | SPI_NOR_DUAL_READ |