diff options
author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-06-11 09:07:04 +0200 |
---|---|---|
committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-06-11 09:07:04 +0200 |
commit | ce33ef997cfeb7b77300227a6ffab9936ea51940 (patch) | |
tree | 50a86b5d51bdc62b7b33b95fcaa3e3e64f9a168b /target/linux/bcm63xx/patches-5.4/023-v5.8-mtd-rawnand-brcmnand-rename-v4-registers.patch | |
parent | e6d4744f9ad0f76ddf1cded75355e240e81be41e (diff) | |
download | upstream-ce33ef997cfeb7b77300227a6ffab9936ea51940.tar.gz upstream-ce33ef997cfeb7b77300227a6ffab9936ea51940.tar.bz2 upstream-ce33ef997cfeb7b77300227a6ffab9936ea51940.zip |
bcm63xx: switch to upstream NAND patches
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/023-v5.8-mtd-rawnand-brcmnand-rename-v4-registers.patch')
-rw-r--r-- | target/linux/bcm63xx/patches-5.4/023-v5.8-mtd-rawnand-brcmnand-rename-v4-registers.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/023-v5.8-mtd-rawnand-brcmnand-rename-v4-registers.patch b/target/linux/bcm63xx/patches-5.4/023-v5.8-mtd-rawnand-brcmnand-rename-v4-registers.patch new file mode 100644 index 0000000000..0c956b36d1 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/023-v5.8-mtd-rawnand-brcmnand-rename-v4-registers.patch @@ -0,0 +1,43 @@ +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) |