Signed-off-by: Tom Rini trini@konsulko.com --- drivers/mtd/nand/raw/lpc32xx_nand_slc.c | 2 +- include/configs/devkit3250.h | 2 +- scripts/config_whitelist.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c index 0f12201aa0e3..1fdc80989fab 100644 --- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c +++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c @@ -132,7 +132,7 @@ static void lpc32xx_nand_init(void) TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) | TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) | TAC_R_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_RWIDTH) | - TAC_R_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_RHOLD) | + TAC_R_HOLD(hclk / CFG_LPC32XX_NAND_SLC_RHOLD) | TAC_R_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_RSETUP), &lpc32xx_nand_slc_regs->tac); } diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index e17896841355..0b815ded7322 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -47,7 +47,7 @@ #define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000 #define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14 #define CONFIG_LPC32XX_NAND_SLC_RWIDTH 66666666 -#define CONFIG_LPC32XX_NAND_SLC_RHOLD 200000000 +#define CFG_LPC32XX_NAND_SLC_RHOLD 200000000 #define CONFIG_LPC32XX_NAND_SLC_RSETUP 50000000
/* diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8c567e45590c..7ced36635799 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -109,7 +109,7 @@ CFG_LPC32XX_NAND_MLC_TCEA_DELAY CFG_LPC32XX_NAND_MLC_WR_HIGH CFG_LPC32XX_NAND_MLC_WR_LOW CFG_LPC32XX_NAND_SLC_RDR_CLKS -CONFIG_LPC32XX_NAND_SLC_RHOLD +CFG_LPC32XX_NAND_SLC_RHOLD CONFIG_LPC32XX_NAND_SLC_RSETUP CONFIG_LPC32XX_NAND_SLC_RWIDTH CONFIG_LPC32XX_NAND_SLC_WDR_CLKS