aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2014-04-03 14:26:50 +0000
committerJohn Crispin <blogic@openwrt.org>2014-04-03 14:26:50 +0000
commitbb51a39fa794e0df497a3d12da1e5493cb4ae8df (patch)
tree31bbd57efd903ce3beecf75966dbbe4cb39f0b90 /target/linux
parent3d1da2bc3f1c0500676a1f8fbc2a2bc27de1de67 (diff)
downloadupstream-bb51a39fa794e0df497a3d12da1e5493cb4ae8df.tar.gz
upstream-bb51a39fa794e0df497a3d12da1e5493cb4ae8df.tar.bz2
upstream-bb51a39fa794e0df497a3d12da1e5493cb4ae8df.zip
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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40369 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/lantiq/config-default1
-rw-r--r--target/linux/lantiq/patches-3.10/0105-mips-lantiq-flash-add-jedec-probe.patch38
2 files changed, 39 insertions, 0 deletions
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) {