[PoC 105/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WHOLD to CFG

Tom Rini
2022-11-20T13:51:28Z

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 7de5c840ed9b..dee8fd24b94b 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -128,7 +128,7 @@ static void lpc32xx_nand_init(void)
/* Configure NAND flash timings */
writel(TAC_W_RDY(CFG_LPC32XX_NAND_SLC_WDR_CLKS) |
TAC_W_WIDTH(hclk / CONFIG_LPC32XX_NAND_SLC_WWIDTH) |
- TAC_W_HOLD(hclk / CONFIG_LPC32XX_NAND_SLC_WHOLD) |
+ TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
TAC_W_SETUP(hclk / CONFIG_LPC32XX_NAND_SLC_WSETUP) |
TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
TAC_R_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_RWIDTH) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index dc16ed84c52c..24312c848e2d 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -43,7 +43,7 @@
*/
#define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14
#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666
-#define CONFIG_LPC32XX_NAND_SLC_WHOLD 200000000
+#define CFG_LPC32XX_NAND_SLC_WHOLD 200000000
#define CONFIG_LPC32XX_NAND_SLC_WSETUP 50000000
#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14
#define CFG_LPC32XX_NAND_SLC_RWIDTH 66666666
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 4f5de41ab95d..9609ea606fd3 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -113,7 +113,7 @@ CFG_LPC32XX_NAND_SLC_RHOLD
CFG_LPC32XX_NAND_SLC_RSETUP
CFG_LPC32XX_NAND_SLC_RWIDTH
CFG_LPC32XX_NAND_SLC_WDR_CLKS
-CONFIG_LPC32XX_NAND_SLC_WHOLD
+CFG_LPC32XX_NAND_SLC_WHOLD
CONFIG_LPC32XX_NAND_SLC_WSETUP
CONFIG_LPC32XX_NAND_SLC_WWIDTH
CONFIG_MACB_SEARCH_PHY
--
2.25.1