target/linux/bcm63xx/patches-5.4/023-v5.8-mtd-rawnand-brcmnand-rename-v4-registers.patch

   1 From 4fd639092b17d4252368b6009573339aeab5c7bd 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:20 +0200
   4 Subject: [PATCH] mtd: rawnand: brcmnand: rename v4 registers
   5 MIME-Version: 1.0
   6 Content-Type: text/plain; charset=UTF-8
   7 Content-Transfer-Encoding: 8bit
   8
   9 These registers are also used on v3.3.
  10
  11 Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
  12 Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
  13 Acked-by: Florian Fainelli <f.fainelli@gmail.com>
  14 Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
  15 Link: https://lore.kernel.org/linux-mtd/20200522121524.4161539-2-noltari@gmail.com
  16 ---
  17  drivers/mtd/nand/raw/brcmnand/brcmnand.c | 8 ++++----
  18  1 file changed, 4 insertions(+), 4 deletions(-)
  19
  20 --- a/drivers/mtd/nand/raw/brcmnand/brcmnand.c
  21 +++ b/drivers/mtd/nand/raw/brcmnand/brcmnand.c
  22 @@ -269,8 +269,8 @@ enum brcmnand_reg {
  23         BRCMNAND_FC_BASE,
  24  };
  25
  26 -/* BRCMNAND v4.0 */
  27 -static const u16 brcmnand_regs_v40[] = {
  28 +/* BRCMNAND v3.3-v4.0 */
  29 +static const u16 brcmnand_regs_v33[] = {
  30         [BRCMNAND_CMD_START]            =  0x04,
  31         [BRCMNAND_CMD_EXT_ADDRESS]      =  0x08,
  32         [BRCMNAND_CMD_ADDRESS]          =  0x0c,
  33 @@ -522,8 +522,8 @@ static int brcmnand_revision_init(struct
  34                 ctrl->reg_offsets = brcmnand_regs_v60;
  35         else if (ctrl->nand_version >= 0x0500)
  36                 ctrl->reg_offsets = brcmnand_regs_v50;
  37 -       else if (ctrl->nand_version >= 0x0400)
  38 -               ctrl->reg_offsets = brcmnand_regs_v40;
  39 +       else if (ctrl->nand_version >= 0x0303)
  40 +               ctrl->reg_offsets = brcmnand_regs_v33;
  41
  42         /* Chip-select stride */
  43         if (ctrl->nand_version >= 0x0701)