openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

mtd: fsmc_nand.c: Use default timings if none are provided in the dts 

Without this patch the timings are all set to 0 if not specified in the dts.
With this patch the driver falls back to use the defaults that are already
present in the driver and are known to work okay for some (older) boards.

Tested on a custom SPEAr600 based board.

Signed-off-by: Stefan Roese <sr@denx.de>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Cc: Viresh Kumar <viresh.linux@gmail.com>
Cc: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Stefan Roese 2015-03-19 14:34:29 +01:00 committed by Brian Norris
parent d800fcabc7
commit 62b57f4c14
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/mtd/nand/fsmc_nand.c
View File

@ -873,6 +873,7 @@ static int fsmc_nand_probe_config_dt(struct platform_device *pdev,
{ {
struct fsmc_nand_platform_data *pdata = dev_get_platdata(&pdev->dev); struct fsmc_nand_platform_data *pdata = dev_get_platdata(&pdev->dev);
u32 val; u32 val;
int ret;
/* Set default NAND width to 8 bits */ /* Set default NAND width to 8 bits */
pdata->width = 8; pdata->width = 8;
@ -891,8 +892,12 @@ static int fsmc_nand_probe_config_dt(struct platform_device *pdev,
sizeof(*pdata->nand_timings), GFP_KERNEL); sizeof(*pdata->nand_timings), GFP_KERNEL);
if (!pdata->nand_timings) if (!pdata->nand_timings)
return -ENOMEM; return -ENOMEM;
of_property_read_u8_array(np, "timings", (u8 *)pdata->nand_timings, ret = of_property_read_u8_array(np, "timings", (u8 *)pdata->nand_timings,
sizeof(*pdata->nand_timings)); sizeof(*pdata->nand_timings));
if (ret) {
dev_info(&pdev->dev, "No timings in dts specified, using default timings!\n");
pdata->nand_timings = NULL;
}
/* Set default NAND bank to 0 */ /* Set default NAND bank to 0 */
pdata->bank = 0; pdata->bank = 0;