mtd: nand: raw: mxs_nand changes for nandbcb
Subsystems (3)
PATCH 1/1 mtd: nand: raw: mxs_nand changes for nandbcb
From: Han Xu <[email protected]>
Add more BCH setting mode and remove the unnecessary platform constrain
Signed-off-by Han Xu <[email protected]>
Signed-off-by Peng Fan <[email protected]>
--- drivers/mtd/nand/raw/mxs_nand.c | 43 ++++++++++++++++++++++++++++++++++++++--- include/mxs_nand.h | 3 ++- 2 files changed, 42 insertions(+), 4 deletions(-)
drivers/mtd/nand/raw/mxs_nand.c +40 -3
@@ -710,7 +710,7 @@ static int mxs_nand_ecc_read_page(struct mtd_info *mtd, struct nand_chip *nand, d->cmd.pio_words[4 ] = (dma_addr_t )nand_info->data_buf; d->cmd.pio_words[5 ] = (dma_addr_t )nand_info->oob_buf; -if ((is_mx7 () ||is_imx8m ()) && nand_info->en_randomizer) { +if (nand_info->en_randomizer) { d->cmd.pio_words[2 ] |=GPMI_ECCCTRL_RANDOMIZER_ENABLE |GPMI_ECCCTRL_RANDOMIZER_TYPE2 ; d->cmd.pio_words[3 ] |= (page %256 ) <<16 ;
@@ -867,7 +867,7 @@ static int mxs_nand_ecc_write_page(struct mtd_info *mtd, d->cmd.pio_words[4 ] = (dma_addr_t )nand_info->data_buf; d->cmd.pio_words[5 ] = (dma_addr_t )nand_info->oob_buf; -if ((is_mx7 () ||is_imx8m ()) && nand_info->en_randomizer) { +if (nand_info->en_randomizer) { d->cmd.pio_words[2 ] |=GPMI_ECCCTRL_RANDOMIZER_ENABLE |GPMI_ECCCTRL_RANDOMIZER_TYPE2 ;/*
@@ -1489,7 +1489,7 @@ void mxs_nand_get_layout(struct mtd_info *mtd, struct mxs_nand_layout *l)/* * Set BCH to specific layout used by ROM bootloader to read FCB. */ -void mxs_nand_mode_fcb (struct mtd_info *mtd) +void mxs_nand_mode_fcb_62bit (struct mtd_info *mtd) {u32 tmp;struct mxs_bch_regs *bch_regs = (struct mxs_bch_regs *)MXS_BCH_BASE ;
@@ -1522,6 +1522,43 @@ void mxs_nand_mode_fcb(struct mtd_info *mtd)writel (tmp, &bch_regs->hw_bch_flash0layout1); } +/* +* Set BCH to specific layout used by ROM bootloader to read FCB. +*/ +void mxs_nand_mode_fcb_40bit (struct mtd_info *mtd) +{ +u32 tmp; +struct mxs_bch_regs *bch_regs = (struct mxs_bch_regs *)MXS_BCH_BASE ; +struct nand_chip *nand =mtd_to_nand (mtd); +struct mxs_nand_info *nand_info =nand_get_controller_data (nand); + +/* no randomizer in this setting*/ + nand_info->en_randomizer =0 ; + + mtd->writesize =1024 ; + mtd->oobsize =1576 -1024 ; + +/* 8 ecc_chunks_*/ + tmp =7 <<BCH_FLASHLAYOUT0_NBLOCKS_OFFSET ; +/* 32 bytes for metadata */ + tmp |=32 <<BCH_FLASHLAYOUT0_META_SIZE_OFFSET ; +/* using ECC40 level to be performed */ + tmp |=0x14 <<BCH_FLASHLAYOUT0_ECC0_OFFSET ; +/* 0x20 * 4 bytes of the data0 block */ + tmp |=0x20 <<BCH_FLASHLAYOUT0_DATA0_SIZE_OFFSET ; + tmp |=0 <<BCH_FLASHLAYOUT0_GF13_0_GF14_1_OFFSET ; +writel (tmp, &bch_regs->hw_bch_flash0layout0); + +/* 1024 for data + 552 for OOB */ + tmp =1576 <<BCH_FLASHLAYOUT1_PAGE_SIZE_OFFSET ; +/* using ECC40 level to be performed */ + tmp |=0x14 <<BCH_FLASHLAYOUT1_ECCN_OFFSET ; +/* 0x20 * 4 bytes of the data0 block */ + tmp |=0x20 <<BCH_FLASHLAYOUT1_DATAN_SIZE_OFFSET ; + tmp |=0 <<BCH_FLASHLAYOUT1_GF13_0_GF14_1_OFFSET ; +writel (tmp, &bch_regs->hw_bch_flash0layout1); +} +/* * Restore BCH to normal settings. */
include/mxs_nand.h +2 -1
@@ -95,7 +95,8 @@ int mxs_nand_init_ctrl(struct mxs_nand_info *nand_info);int mxs_nand_init_spl (struct nand_chip *nand);int mxs_nand_setup_ecc (struct mtd_info *mtd); -void mxs_nand_mode_fcb (struct mtd_info *mtd); +void mxs_nand_mode_fcb_62bit (struct mtd_info *mtd); +void mxs_nand_mode_fcb_40bit (struct mtd_info *mtd);void mxs_nand_mode_normal (struct mtd_info *mtd);u32 mxs_nand_mark_byte_offset (struct mtd_info *mtd);u32 mxs_nand_mark_bit_offset (struct mtd_info *mtd);
Signature · 1 line
2.16.4
PATCH 1/1 mtd: nand: raw: mxs_nand changes for nandbcb
Quoted 4 lines
From: Han Xu <[email protected]>
Add more BCH setting mode and remove the unnecessary platform constrainSigned-off-by Han Xu <[email protected]>Signed-off-by Peng Fan <[email protected]>
Applied to u-boot-imx, master, thanks !
Best regards,
Stefano Babic
Signature · 5 lines
===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de =====================================================================