You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 4fd639092b17d4252368b6009573339aeab5c7bd 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:20 +0200
|
|
Subject: [PATCH] mtd: rawnand: brcmnand: rename v4 registers
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
These registers are also used on v3.3.
|
|
|
|
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
|
|
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.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-2-noltari@gmail.com
|
|
---
|
|
drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
|
+++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
|
|
@@ -269,8 +269,8 @@ enum brcmnand_reg {
|
|
BRCMNAND_FC_BASE,
|
|
};
|
|
|
|
-/* BRCMNAND v4.0 */
|
|
-static const u16 brcmnand_regs_v40[] = {
|
|
+/* BRCMNAND v3.3-v4.0 */
|
|
+static const u16 brcmnand_regs_v33[] = {
|
|
[BRCMNAND_CMD_START] = 0x04,
|
|
[BRCMNAND_CMD_EXT_ADDRESS] = 0x08,
|
|
[BRCMNAND_CMD_ADDRESS] = 0x0c,
|
|
@@ -522,8 +522,8 @@ static int brcmnand_revision_init(struct
|
|
ctrl->reg_offsets = brcmnand_regs_v60;
|
|
else if (ctrl->nand_version >= 0x0500)
|
|
ctrl->reg_offsets = brcmnand_regs_v50;
|
|
- else if (ctrl->nand_version >= 0x0400)
|
|
- ctrl->reg_offsets = brcmnand_regs_v40;
|
|
+ else if (ctrl->nand_version >= 0x0303)
|
|
+ ctrl->reg_offsets = brcmnand_regs_v33;
|
|
|
|
/* Chip-select stride */
|
|
if (ctrl->nand_version >= 0x0701)
|