aboutsummaryrefslogtreecommitdiff
path: root/drivers/mtd/maps/physmap_of.c
diff options
context:
space:
mode:
authorDavid Barksdale <amatus@amatus.name>2014-08-13 16:29:15 -0500
committerDavid Barksdale <amatus@amatus.name>2014-08-13 16:29:15 -0500
commit205ac4d83fc388c1e2d0bb590a2a36e9a4c2fd78 (patch)
tree1dbd529848c396058dfc9c8a4f402dcbe3546317 /drivers/mtd/maps/physmap_of.c
parentace6c6d243016e272050787c14e27a83ecd94a25 (diff)
Diffstat (limited to 'drivers/mtd/maps/physmap_of.c')
-rw-r--r--drivers/mtd/maps/physmap_of.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index efb2d3699e4..4b2f062218b 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -228,6 +228,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
" tree\n");
goto err_out;
}
+
dev_dbg(&dev->dev, "of_flash device: %.8llx-%.8llx\n",
(unsigned long long)res.start,
(unsigned long long)res.end);
@@ -345,6 +346,12 @@ err_flash_remove:
}
static struct of_device_id of_flash_match[] = {
+#ifndef CONFIG_APOLLO3G
+ {
+ .compatible = "cfi-flash",
+ .data = (void *)"cfi_probe",
+ },
+#endif
{
/* FIXME: JEDEC chips can't be safely and reliably
* probed, although the mtd code gets it right in
@@ -356,10 +363,12 @@ static struct of_device_id of_flash_match[] = {
.compatible = "jedec-flash",
.data = (void *)"jedec_probe",
},
+#ifdef CONFIG_APOLLO3G
{
.compatible = "cfi-flash",
.data = (void *)"cfi_probe",
},
+#endif
{
.compatible = "mtd-ram",
.data = (void *)"map_ram",