From: John Crispin <john@openwrt.org>
Date: Thu, 3 Apr 2014 14:26:50 +0000 (+0000)
Subject: lantiq: BT Home Hub 2B support - jedec probe
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=469b8297fab3a589da4e598cb915e75dfd87dcba;p=openwrt%2Fsvn-archive%2Fopenwrt.git

lantiq: BT Home Hub 2B support - jedec probe

Lantiq nor patch. Adds support for jedec probing if cfi
probing fails.

Signed-off-by: Ben Mulvihill <ben.mulvihill@gmail.com>

SVN-Revision: 40369
---

diff --git a/target/linux/lantiq/config-default b/target/linux/lantiq/config-default
index 1efab8b24a..c8e9d8521f 100644
--- a/target/linux/lantiq/config-default
+++ b/target/linux/lantiq/config-default
@@ -100,6 +100,7 @@ CONFIG_MODULES_USE_ELF_REL=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
 CONFIG_MTD_CFI_GEOMETRY=y
 CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_LANTIQ=y
 # CONFIG_MTD_NAND_XWAY is not set
 CONFIG_MTD_OF_PARTS=y
diff --git a/target/linux/lantiq/patches-3.10/0105-mips-lantiq-flash-add-jedec-probe.patch b/target/linux/lantiq/patches-3.10/0105-mips-lantiq-flash-add-jedec-probe.patch
new file mode 100644
index 0000000000..327a45ccd8
--- /dev/null
+++ b/target/linux/lantiq/patches-3.10/0105-mips-lantiq-flash-add-jedec-probe.patch
@@ -0,0 +1,38 @@
+Makes the Lantiq flash driver try jedec probing if cfi probing fails.
+
+(Based on work by Simon Hayes first published on www.psidoc.com and 
+http://sourceforge.net/projects/hh2b4ever/)
+
+Signed-off-by: Ben Mulvihill <ben.mulvihill@gmail.com>
+
+---
+ lantiq-flash.c |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+--- a/drivers/mtd/maps/lantiq-flash.c	2014-03-23 09:18:25.099370216 +0100
++++ b/drivers/mtd/maps/lantiq-flash.c	2014-03-19 17:19:45.732111306 +0100
+@@ -117,6 +117,11 @@ ltq_mtd_probe(struct platform_device *pd
+ 	struct cfi_private *cfi;
+ 	int err;
+ 
++	static const char *rom_probe_types[] = {
++		"cfi_probe", "jedec_probe", NULL
++	};
++	const char **type;
++
+ 	if (of_machine_is_compatible("lantiq,falcon") &&
+ 			(ltq_boot_select() != BS_FLASH)) {
+ 		dev_err(&pdev->dev, "invalid bootstrap options\n");
+@@ -154,7 +159,11 @@ ltq_mtd_probe(struct platform_device *pd
+ 	ltq_mtd->map->copy_to = ltq_copy_to;
+ 
+ 	ltq_mtd->map->map_priv_1 = LTQ_NOR_PROBING;
+-	ltq_mtd->mtd = do_map_probe("cfi_probe", ltq_mtd->map);
++
++	for (type = rom_probe_types; !ltq_mtd->mtd && *type; type++) {
++		ltq_mtd->mtd = do_map_probe(*type, ltq_mtd->map);
++	}
++ 
+ 	ltq_mtd->map->map_priv_1 = LTQ_NOR_NORMAL;
+ 
+ 	if (!ltq_mtd->mtd) {