diff options
Diffstat (limited to 'drivers/mtd')
| -rw-r--r-- | drivers/mtd/maps/physmap_of.c | 9 | ||||
| -rw-r--r-- | drivers/mtd/nand/ndfc.c | 2 |
2 files changed, 10 insertions, 1 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", diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c index 568608d638c..c1d4ddd3458 100644 --- a/drivers/mtd/nand/ndfc.c +++ b/drivers/mtd/nand/ndfc.c @@ -102,7 +102,7 @@ static int ndfc_calculate_ecc(struct mtd_info *mtd, wmb(); ecc = in_be32(ndfc->ndfcbase + NDFC_ECC); /* The NDFC uses Smart Media (SMC) bytes order */ -#if !defined(CONFIG_APM82181) +#if !defined(CONFIG_APOLLO3G) ecc_code[0] = p[1]; ecc_code[1] = p[2]; ecc_code[2] = p[3]; |