ath79: mikrotik: erase firmware on SPI NOR before install
[openwrt/openwrt.git] / target / linux / bcm63xx / patches-5.4 / 024-v5.8-mtd-rawnand-brcmnand-fix-CS0-layout.patch
1 From 3d3fb3c5be9ce07fa85d8f67fb3922e4613b955b Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
3 Date: Fri, 22 May 2020 14:15:21 +0200
4 Subject: [PATCH] mtd: rawnand: brcmnand: fix CS0 layout
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
8
9 Only v3.3-v5.0 have a different CS0 layout.
10 Controllers before v3.3 use the same layout for every CS.
11
12 Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller")
13 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
14 Acked-by: Florian Fainelli <f.fainelli@gmail.com>
15 Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
16 Link: https://lore.kernel.org/linux-mtd/20200522121524.4161539-3-noltari@gmail.com
17 ---
18 drivers/mtd/nand/raw/brcmnand/brcmnand.c | 5 +++--
19 1 file changed, 3 insertions(+), 2 deletions(-)
20
21 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
22 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
23 @@ -537,8 +537,9 @@ static int brcmnand_revision_init(struct
24 } else {
25 ctrl->cs_offsets = brcmnand_cs_offsets;
26
27 - /* v5.0 and earlier has a different CS0 offset layout */
28 - if (ctrl->nand_version <= 0x0500)
29 + /* v3.3-5.0 have a different CS0 offset layout */
30 + if (ctrl->nand_version >= 0x0303 &&
31 + ctrl->nand_version <= 0x0500)
32 ctrl->cs0_offsets = brcmnand_cs_offsets_cs0;
33 }
34