summaryrefslogtreecommitdiff
path: root/drivers/mtd/maps
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2012-05-05 15:41:42 +0200
committerRalf Baechle <ralf@linux-mips.org>2012-05-21 14:31:55 +0100
commitfa09eded0e3764ddb8a97440f5b5c5e65e413b6a (patch)
treef0c018c8ac12a017bf21c2cd808794142bcafa4f /drivers/mtd/maps
parent02fa961fbf1c79783781cb8967b80ceaa8be4832 (diff)
downloadlinux-3.10-fa09eded0e3764ddb8a97440f5b5c5e65e413b6a.tar.gz
linux-3.10-fa09eded0e3764ddb8a97440f5b5c5e65e413b6a.tar.bz2
linux-3.10-fa09eded0e3764ddb8a97440f5b5c5e65e413b6a.zip
MTD: MIPS: lantiq: verify that the NOR interface is available on falcon soc
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> Acked-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Cc: linux-mtd@lists.infradead.org Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/3815/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'drivers/mtd/maps')
-rw-r--r--drivers/mtd/maps/lantiq-flash.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/mtd/maps/lantiq-flash.c b/drivers/mtd/maps/lantiq-flash.c
index aefa1112167..c03456f1700 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);