| From 3d3fb3c5be9ce07fa85d8f67fb3922e4613b955b Mon Sep 17 00:00:00 2001 |
| From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com> |
| Date: Fri, 22 May 2020 14:15:21 +0200 |
| Subject: [PATCH] mtd: rawnand: brcmnand: fix CS0 layout |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit 3d3fb3c5be9ce07fa85d8f67fb3922e4613b955b upstream. |
| |
| Only v3.3-v5.0 have a different CS0 layout. |
| Controllers before v3.3 use the same layout for every CS. |
| |
| Fixes: 27c5b17cd1b1 ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller") |
| Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> |
| Acked-by: Florian Fainelli <f.fainelli@gmail.com> |
| Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com> |
| Link: https://lore.kernel.org/linux-mtd/20200522121524.4161539-3-noltari@gmail.com |
| |
| diff --git a/drivers/mtd/nand/raw/brcmnand/brcmnand.c b/drivers/mtd/nand/raw/brcmnand/brcmnand.c |
| index 0abd5d5fd54d..0a2a76195047 100644 |
| --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c |
| +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c |
| @@ -605,8 +605,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) |
| } else { |
| ctrl->cs_offsets = brcmnand_cs_offsets; |
| |
| - /* v5.0 and earlier has a different CS0 offset layout */ |
| - if (ctrl->nand_version <= 0x0500) |
| + /* v3.3-5.0 have a different CS0 offset layout */ |
| + if (ctrl->nand_version >= 0x0303 && |
| + ctrl->nand_version <= 0x0500) |
| ctrl->cs0_offsets = brcmnand_cs_offsets_cs0; |
| } |
| |
| -- |
| 2.27.0 |
| |
