diff --git a/drivers/amlogic/mtd/aml_hwctrl.h b/drivers/amlogic/mtd/aml_hwctrl.h index 7437b651ccf9..0f07139e03ed 100644 --- a/drivers/amlogic/mtd/aml_hwctrl.h +++ b/drivers/amlogic/mtd/aml_hwctrl.h @@ -439,21 +439,16 @@ static inline void amlnf_clr_reg32_mask(uint32_t *_reg, *#define NFC_CMD_I_ADR(addr) NFC_CMD_ADI(addr), NFC_CMD_ADI(addr) */ -#define NAND_ECC_NONE (0x0) -#define NAND_ECC_BCH8 (0x1) -#define NAND_ECC_BCH8_1K (0x2) -#define NAND_ECC_BCH16_1K (0x3) -#define NAND_ECC_BCH24_1K (0x4) -#define NAND_ECC_BCH24_1K_M8 (0x3) -#define NAND_ECC_BCH30_1K (0x5) -#define NAND_ECC_BCH30_1K_M8 (0x4) -#define NAND_ECC_BCH40_1K (0x6) -#define NAND_ECC_BCH40_1K_M8 (0x5) -#define NAND_ECC_BCH50_1K_M8 (0x6) +#define NAND_ECC_NONE (0x0) +#define NAND_ECC_BCH8 (0x1) +#define NAND_ECC_BCH8_1K (0x2) +#define NAND_ECC_BCH24_1K (0x3) +#define NAND_ECC_BCH30_1K (0x4) +#define NAND_ECC_BCH40_1K (0x5) +#define NAND_ECC_BCH50_1K (0x6) /*NAND_ECC_BCH50_1K only for mtd for general*/ -#define NAND_ECC_BCH50_1K (0x6) -#define NAND_ECC_BCH60_1K (0x7) -#define NAND_ECC_BCH_SHORT (0x8) +#define NAND_ECC_BCH60_1K (0x7) +#define NAND_ECC_BCH_SHORT (0x8) #define PER_INFO_BYTE 8 diff --git a/drivers/amlogic/mtd/m3_nand.c b/drivers/amlogic/mtd/m3_nand.c index 128cf9790ee6..1cb3deedb44d 100644 --- a/drivers/amlogic/mtd/m3_nand.c +++ b/drivers/amlogic/mtd/m3_nand.c @@ -436,17 +436,6 @@ static int m3_nand_options_confirm(struct aml_nand_chip *aml_chip) aml_chip->ecc_max = 8; chip->ecc.steps = mtd->writesize / chip->ecc.size; break; - /*don't support for new chip(greater than m8)*/ - case NAND_ECC_BCH16_1K_MODE: - chip->ecc.strength = 16; - chip->ecc.size = NAND_ECC_UNIT_1KSIZE; - chip->ecc.bytes = NAND_BCH16_1K_ECC_SIZE; - aml_chip->bch_mode = NAND_ECC_BCH16_1K; - aml_chip->user_byte_mode = 2; - aml_chip->ecc_cnt_limit = 14; - aml_chip->ecc_max = 16; - chip->ecc.steps = mtd->writesize / chip->ecc.size; - break; case NAND_ECC_BCH24_1K_MODE: chip->ecc.strength = 24;