Commit d267aefc authored by Florian Fainelli's avatar Florian Fainelli Committed by David Woodhouse
Browse files

mtd: brcmnand: Fix v7.1 register offsets 



The BRCMNAND controller revision 7.1 is almost 100% compatible with the
previous v6.0 register offset layout, except for the Correctable Error
Reporting Threshold registers. Fix this by adding another table with the
correct offsets for CORR_THRESHOLD and CORR_THRESHOLD_EXT.

Fixes: 27c5b17c ("mtd: nand: add NAND driver "library" for Broadcom STB NAND controller")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 5e64c29e

drivers/mtd/nand/brcmnand/brcmnand.c

+33 −1
Original line number Diff line number Diff line
@@ -311,6 +311,36 @@ static const u16 brcmnand_regs_v60[] = { 
	[BRCMNAND_FC_BASE]		= 0x400,

};



/* BRCMNAND v7.1 */

static const u16 brcmnand_regs_v71[] = {

	[BRCMNAND_CMD_START]		=  0x04,

	[BRCMNAND_CMD_EXT_ADDRESS]	=  0x08,

	[BRCMNAND_CMD_ADDRESS]		=  0x0c,

	[BRCMNAND_INTFC_STATUS]		=  0x14,

	[BRCMNAND_CS_SELECT]		=  0x18,

	[BRCMNAND_CS_XOR]		=  0x1c,

	[BRCMNAND_LL_OP]		=  0x20,

	[BRCMNAND_CS0_BASE]		=  0x50,

	[BRCMNAND_CS1_BASE]		=     0,

	[BRCMNAND_CORR_THRESHOLD]	=  0xdc,

	[BRCMNAND_CORR_THRESHOLD_EXT]	=  0xe0,

	[BRCMNAND_UNCORR_COUNT]		=  0xfc,

	[BRCMNAND_CORR_COUNT]		= 0x100,

	[BRCMNAND_CORR_EXT_ADDR]	= 0x10c,

	[BRCMNAND_CORR_ADDR]		= 0x110,

	[BRCMNAND_UNCORR_EXT_ADDR]	= 0x114,

	[BRCMNAND_UNCORR_ADDR]		= 0x118,

	[BRCMNAND_SEMAPHORE]		= 0x150,

	[BRCMNAND_ID]			= 0x194,

	[BRCMNAND_ID_EXT]		= 0x198,

	[BRCMNAND_LL_RDATA]		= 0x19c,

	[BRCMNAND_OOB_READ_BASE]	= 0x200,

	[BRCMNAND_OOB_READ_10_BASE]	=     0,

	[BRCMNAND_OOB_WRITE_BASE]	= 0x280,

	[BRCMNAND_OOB_WRITE_10_BASE]	=     0,

	[BRCMNAND_FC_BASE]		= 0x400,

};



enum brcmnand_cs_reg {

	BRCMNAND_CS_CFG_EXT = 0,

	BRCMNAND_CS_CFG,
@@ -406,7 +436,9 @@ static int brcmnand_revision_init(struct brcmnand_controller *ctrl) 
	}



	/* Register offsets */

	if (ctrl->nand_version >= 0x0600)

	if (ctrl->nand_version >= 0x0701)

		ctrl->reg_offsets = brcmnand_regs_v71;

	else if (ctrl->nand_version >= 0x0600)

		ctrl->reg_offsets = brcmnand_regs_v60;

	else if (ctrl->nand_version >= 0x0500)

		ctrl->reg_offsets = brcmnand_regs_v50;

CRA Git | Maintained and supported by SUSTech CRA and CCSE