[PoC 107/241] global: Migrate CONFIG_LPC32XX_NAND_SLC_WWIDTH to CFG

Tom Rini
2022-11-20T13:55:35Z

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 a070df81d7cd..356f8d9440bb 100644
--- a/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
+++ b/drivers/mtd/nand/raw/lpc32xx_nand_slc.c
@@ -127,7 +127,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_WIDTH(hclk / CFG_LPC32XX_NAND_SLC_WWIDTH) |
TAC_W_HOLD(hclk / CFG_LPC32XX_NAND_SLC_WHOLD) |
TAC_W_SETUP(hclk / CFG_LPC32XX_NAND_SLC_WSETUP) |
TAC_R_RDY(CFG_LPC32XX_NAND_SLC_RDR_CLKS) |
diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h
index 5719e422da97..9cfee381d4ac 100644
--- a/include/configs/devkit3250.h
+++ b/include/configs/devkit3250.h
@@ -42,7 +42,7 @@
* NAND chip timings
*/
#define CFG_LPC32XX_NAND_SLC_WDR_CLKS 14
-#define CONFIG_LPC32XX_NAND_SLC_WWIDTH 66666666
+#define CFG_LPC32XX_NAND_SLC_WWIDTH 66666666
#define CFG_LPC32XX_NAND_SLC_WHOLD 200000000
#define CFG_LPC32XX_NAND_SLC_WSETUP 50000000
#define CFG_LPC32XX_NAND_SLC_RDR_CLKS 14
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 1051a7b949ec..58792f1d2b7c 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -115,7 +115,7 @@ CFG_LPC32XX_NAND_SLC_RWIDTH
CFG_LPC32XX_NAND_SLC_WDR_CLKS
CFG_LPC32XX_NAND_SLC_WHOLD
CFG_LPC32XX_NAND_SLC_WSETUP
-CONFIG_LPC32XX_NAND_SLC_WWIDTH
+CFG_LPC32XX_NAND_SLC_WWIDTH
CONFIG_MACB_SEARCH_PHY
CONFIG_MALLOC_F_ADDR
CONFIG_MALTA
--
2.25.1