From d8e798c81ed076d6ab1e55e9448ba92e6b2c1f84 Mon Sep 17 00:00:00 2001
From: John Crispin <blogic@openwrt.org>
Date: Sat, 5 May 2012 15:41:42 +0200
Subject: [PATCH] --- yaml --- r: 309092 b: refs/heads/master c:
 fa09eded0e3764ddb8a97440f5b5c5e65e413b6a h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/mtd/maps/lantiq-flash.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 38895f5ba5f2..c9ef3f40ba17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02fa961fbf1c79783781cb8967b80ceaa8be4832
+refs/heads/master: fa09eded0e3764ddb8a97440f5b5c5e65e413b6a
diff --git a/trunk/drivers/mtd/maps/lantiq-flash.c b/trunk/drivers/mtd/maps/lantiq-flash.c
index aefa11121674..c03456f17004 100644
--- a/trunk/drivers/mtd/maps/lantiq-flash.c
+++ b/trunk/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);