mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-24 07:46:48 +00:00
fa79baf4a6
Copy backport, hack, pending patch and config from 5.15 to 6.1. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
35 lines
1.5 KiB
Diff
35 lines
1.5 KiB
Diff
From 8bf2ce6ea4ee840b70f55a27f80e1cd308051b13 Mon Sep 17 00:00:00 2001
|
|
From: Nick Hainke <vincent@systemli.org>
|
|
Date: Mon, 27 Dec 2021 00:38:13 +0100
|
|
Subject: [PATCH 1/2] mtd: spi-nor: locking support for MX25L6405D
|
|
|
|
Macronix MX25L6405D supports locking with four block-protection bits.
|
|
Currently, the driver only sets three bits. If the bootloader does not
|
|
sustain the flash chip in an unlocked state, the flash might be
|
|
non-writeable. Add the corresponding flag to enable locking support with
|
|
four bits in the status register.
|
|
|
|
Tested on Nanostation M2 XM.
|
|
|
|
Similar to commit 7ea40b54e83b ("mtd: spi-nor: enable locking support for
|
|
MX25L12805D")
|
|
|
|
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
Signed-off-by: Nick Hainke <vincent@systemli.org>
|
|
---
|
|
drivers/mtd/spi-nor/macronix.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/mtd/spi-nor/macronix.c
|
|
+++ b/drivers/mtd/spi-nor/macronix.c
|
|
@@ -41,7 +41,8 @@ static const struct flash_info macronix_
|
|
{ "mx25l1606e", INFO(0xc22015, 0, 64 * 1024, 32, SECT_4K) },
|
|
{ "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, SECT_4K) },
|
|
{ "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) },
|
|
- { "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K) },
|
|
+ { "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, SECT_4K |
|
|
+ SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP) },
|
|
{ "mx25u2033e", INFO(0xc22532, 0, 64 * 1024, 4, SECT_4K) },
|
|
{ "mx25u3235f", INFO(0xc22536, 0, 64 * 1024, 64,
|
|
SECT_4K | SPI_NOR_DUAL_READ |
|