qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UPSTREAM: 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.

Change-Id: I9c63239a11f0687332f71728ef2d45db9c3687f8
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
(cherry picked from commit 57f9bb9404e0578b4701ff900fdfa884d84c74b0)
This commit is contained in:
Masahiro Yamada 2017-11-29 19:19:09 +09:00 committed by Kever Yang
parent 9a0651a263
commit 7be88841ae
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/mtd/nand/denali.c
View File

@ -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