f724a583dc
This updates the NAND driver for MikroTik RB4XX series to work with kernel 5.10, similarly to the ar934x-nand driver (fb64e2c3). Support for kernel 5.10 was added to all ath79 subtargets except for the mikrotik one by commitd6b785d, since patch 920-mikrotik-rb4xx.patch needed to be reworked. Later, commitf8512661enabled kernel 5.10 for the mikrotik subtarget with the nand-rb4xx driver still pending, which is updated and added back by this patch. Compile-tested only. Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net>
34 lines
1.4 KiB
Diff
34 lines
1.4 KiB
Diff
From a449cd03db4d0e1d292b3734f7676634cfd94f53 Mon Sep 17 00:00:00 2001
|
|
From: David Bauer <mail@david-bauer.net>
|
|
Date: Sun, 25 Oct 2020 01:14:22 +0200
|
|
Subject: [PATCH] mtd: spi-nor: use 4 bit locking for MX25L12805D
|
|
|
|
Macronix MX25L12805D supports locking with 4 block
|
|
protection bits in its status register. Add the corresponding
|
|
flag in order to clear these bits when unloking the flash.
|
|
|
|
Otherwise, the flash might not be writable depending on the state
|
|
left by the bootloader.
|
|
|
|
Tested-on: Ubiquiti UniFi AC Lite (ath79)
|
|
|
|
Fixes commit 62593cf40b23 ("mtd: spi-nor: refactor block protection functions")
|
|
|
|
Signed-off-by: David Bauer <mail@david-bauer.net>
|
|
---
|
|
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
|
|
@@ -50,7 +50,8 @@ static const struct flash_info macronix_
|
|
{ "mx25u4035", INFO(0xc22533, 0, 64 * 1024, 8, SECT_4K) },
|
|
{ "mx25u8035", INFO(0xc22534, 0, 64 * 1024, 16, SECT_4K) },
|
|
{ "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
|
|
- { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, SECT_4K) },
|
|
+ { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, SECT_4K |
|
|
+ SPI_NOR_HAS_LOCK | SPI_NOR_4BIT_BP) },
|
|
{ "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
|
|
{ "mx25r1635f", INFO(0xc22815, 0, 64 * 1024, 32,
|
|
SECT_4K | SPI_NOR_DUAL_READ |
|