projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mtd
/
nand
/
fsmc_nand.c
diff --git
a/drivers/mtd/nand/fsmc_nand.c
b/drivers/mtd/nand/fsmc_nand.c
index c543cc09f1936e5a7181282186ffdeea0b059646..09af555408b773a52c5b806436af5274d395d643 100644
(file)
--- a/
drivers/mtd/nand/fsmc_nand.c
+++ b/
drivers/mtd/nand/fsmc_nand.c
@@
-1211,6
+1211,7
@@
static SIMPLE_DEV_PM_OPS(fsmc_nand_pm_ops, fsmc_nand_suspend, fsmc_nand_resume);
#ifdef CONFIG_OF
static const struct of_device_id fsmc_nand_id_table[] = {
{ .compatible = "st,spear600-fsmc-nand" },
+ { .compatible = "stericsson,fsmc-nand" },
{}
};
MODULE_DEVICE_TABLE(of, fsmc_nand_id_table);