summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-05-07 16:28:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-05-07 16:28:52 -0700
commit9f1eb57dc706b98bd775d613570f157b6d888c35 (patch)
treeb99e1cc09c5fa8b1bb1aeee7673d3673b94c6bec /drivers
parent7ceeff443be92913f7edd1134d677fa2a1824cd0 (diff)
parent28c015a9daabe4ed3aeb0ccf669a3f1c2b8b81d5 (diff)
downloadlinux-9f1eb57dc706b98bd775d613570f157b6d888c35.tar.gz
linux-9f1eb57dc706b98bd775d613570f157b6d888c35.tar.bz2
linux-9f1eb57dc706b98bd775d613570f157b6d888c35.zip
Merge tag 'for-linus-20140507' of git://git.infradead.org/linux-mtd
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mtd/nand/davinci_nand.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mtd/nand/davinci_nand.c b/drivers/mtd/nand/davinci_nand.c
index 4615d79fc93f..b922c8efcf40 100644
--- a/drivers/mtd/nand/davinci_nand.c
+++ b/drivers/mtd/nand/davinci_nand.c
@@ -523,6 +523,7 @@ static struct nand_ecclayout hwecc4_2048 = {
#if defined(CONFIG_OF)
static const struct of_device_id davinci_nand_of_match[] = {
{.compatible = "ti,davinci-nand", },
+ {.compatible = "ti,keystone-nand", },
{},
};
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,
"ti,davinci-nand-use-bbt"))
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);