Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+6
+6
drivers/mtd/nand/davinci_nand.c
+6
drivers/mtd/nand/davinci_nand.c
···
523
523
#if defined(CONFIG_OF)
524
524
static const struct of_device_id davinci_nand_of_match[] = {
525
525
{.compatible = "ti,davinci-nand", },
526
+
{.compatible = "ti,keystone-nand", },
526
527
{},
527
528
};
528
529
MODULE_DEVICE_TABLE(of, davinci_nand_of_match);
···
582
581
of_property_read_bool(pdev->dev.of_node,
583
582
"ti,davinci-nand-use-bbt"))
584
583
pdata->bbt_options = NAND_BBT_USE_FLASH;
584
+
585
+
if (of_device_is_compatible(pdev->dev.of_node,
586
+
"ti,keystone-nand")) {
587
+
pdata->options |= NAND_NO_SUBPAGE_WRITE;
588
+
}
585
589
}
586
590
587
591
return dev_get_platdata(&pdev->dev);