lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd

Browse Source 
Pull MTD fix from Brian Norris:
 "A single update for Keystone SoC's, whose NAND controller does not
  support subpage programming"

* tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd:
  mtd: davinci-nand: disable subpage write for keystone-nand
This commit is contained in:
Linus Torvalds
2014-05-07 16:28:52 -07:00
parent 7ceeff443b 28c015a9da
commit 9f1eb57dc7
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/nand/davinci_nand.c
View File

@@ -523,6 +523,7 @@ static struct nand_ecclayout hwecc4_2048 = {
#if defined(CONFIG_OF) #if defined(CONFIG_OF)
static const struct of_device_id davinci_nand_of_match[] = { static const struct of_device_id davinci_nand_of_match[] = {
{.compatible = "ti,davinci-nand", }, {.compatible = "ti,davinci-nand", },
{.compatible = "ti,keystone-nand", },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, davinci_nand_of_match); MODULE_DEVICE_TABLE(of, davinci_nand_of_match);
@@ -581,6 +582,11 @@ static struct davinci_nand_pdata
of_property_read_bool(pdev->dev.of_node, of_property_read_bool(pdev->dev.of_node,
"ti,davinci-nand-use-bbt")) "ti,davinci-nand-use-bbt"))
pdata->bbt_options = NAND_BBT_USE_FLASH; pdata->bbt_options = NAND_BBT_USE_FLASH;
if (of_device_is_compatible(pdev->dev.of_node,
"ti,keystone-nand")) {
pdata->options |= NAND_NO_SUBPAGE_WRITE;
}
} }
return dev_get_platdata(&pdev->dev); return dev_get_platdata(&pdev->dev);