From: Masahiro Yamada <yamada.masahiro@socionext.com>
Date: Wed, 29 Nov 2017 10:19:09 +0000 (+0900)
Subject: mtd: nand: denali: remove ad-hoc board_nand_init() entry
X-Git-Tag: v2018.01-rc1~1^2~4
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=57f9bb9404e0578b4701ff900fdfa884d84c74b0;p=u-boot

mtd: nand: denali: remove ad-hoc board_nand_init() entry

This driver is highly dependent on the configuration from denali_dt.c
Please enable CONFIG_NAND_DENALI_DT if you use this driver.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---

diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c
index 7a87adc378..8ff2d09422 100644
--- a/drivers/mtd/nand/denali.c
+++ b/drivers/mtd/nand/denali.c
@@ -1366,29 +1366,3 @@ free_buf:
 
 	return ret;
 }
-
-#ifndef CONFIG_NAND_DENALI_DT
-static int __board_nand_init(void)
-{
-	struct denali_nand_info *denali;
-
-	denali = kzalloc(sizeof(*denali), GFP_KERNEL);
-	if (!denali)
-		return -ENOMEM;
-
-	/*
-	 * In the future, these base addresses should be taken from
-	 * Device Tree or platform data.
-	 */
-	denali->reg = (void  __iomem *)CONFIG_SYS_NAND_REGS_BASE;
-	denali->host = (void  __iomem *)CONFIG_SYS_NAND_DATA_BASE;
-
-	return denali_init(denali);
-}
-
-void board_nand_init(void)
-{
-	if (__board_nand_init() < 0)
-		pr_warn("Failed to initialize Denali NAND controller.\n");
-}
-#endif