| Message ID | 1511950749-9502-1-git-send-email-yamada.masahiro@socionext.com |
|---|---|
| State | Accepted |
| Commit | 57f9bb9404e0578b4701ff900fdfa884d84c74b0 |
| Headers | show |
| Series | mtd: nand: denali: remove ad-hoc board_nand_init() entry | expand |
2017-11-29 19:19 GMT+09:00 Masahiro Yamada <yamada.masahiro@socionext.com>: > 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> Applied to u-boot-uniphier.
diff --git a/drivers/mtd/nand/denali.c b/drivers/mtd/nand/denali.c index 7a87adc..8ff2d09 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
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> --- drivers/mtd/nand/denali.c | 26 -------------------------- 1 file changed, 26 deletions(-)