| Message ID | 1337017363-14424-14-git-send-email-blogic@openwrt.org |
|---|---|
| State | Accepted |
| Commit | fa09eded0e3764ddb8a97440f5b5c5e65e413b6a |
| Headers | show |
On Mon, 2012-05-14 at 19:42 +0200, John Crispin wrote: > When running on a FALC-ON SoC, we need to check the bootstrap options to see > if NOR is available. > > Signed-off-by: John Crispin <blogic@openwrt.org> > Cc: linux-mtd@lists.infradead.org Acked-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c index aefa111..c03456f 100644 --- a/drivers/mtd/maps/lantiq-flash.c +++ b/drivers/mtd/maps/lantiq-flash.c @@ -19,6 +19,7 @@ #include <linux/mtd/cfi.h> #include <linux/platform_device.h> #include <linux/mtd/physmap.h> +#include <linux/of.h> #include <lantiq_soc.h> @@ -116,6 +117,12 @@ ltq_mtd_probe(struct platform_device *pdev) struct cfi_private *cfi; int err; + if (of_machine_is_compatible("lantiq,falcon") && + (ltq_boot_select() != BS_FLASH)) { + dev_err(&pdev->dev, "invalid bootstrap options\n"); + return -ENODEV; + } + ltq_mtd = kzalloc(sizeof(struct ltq_mtd), GFP_KERNEL); platform_set_drvdata(pdev, ltq_mtd);
When running on a FALC-ON SoC, we need to check the bootstrap options to see if NOR is available. Signed-off-by: John Crispin <blogic@openwrt.org> Cc: linux-mtd@lists.infradead.org --- This patch is part of a series moving the mips/lantiq target to OF and clkdev support. The patch, once Acked, should go upstream via Ralf's MIPS tree. drivers/mtd/maps/lantiq-flash.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)