[oe] [meta-handheld][PATCH 4/6] linux-yocto: collie: force CFI detection (temporary HACK)

[Andrea Adami]

The CFI detection fails but all other reads can be done correctly
Enjoy this hack until the (mis)detection is fixed.

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
 .../linux/linux-yocto-3.10/collie/collie.scc       |  1 +
 .../patches/patches-mtd/collie-force-cfi.patch     | 30 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch

diff --git a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
index 4f60d81..536f4b1 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
+++ b/recipes-kernel/linux/linux-yocto-3.10/collie/collie.scc
@@ -8,3 +8,4 @@ patch ../patches/patches-mfd/mcp-device.patch
 patch ../patches/patches-mfd/ucb1x00-device.patch
 //patch ../patches/patches-mtd/collie-jedec-probe.patch
 patch ../patches/patches-mtd/collie-eraseinfo.patch
+patch ../patches/patches-mtd/collie-force-cfi.patch
diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch
new file mode 100644
index 0000000..958fce7
--- /dev/null
+++ b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-force-cfi.patch
@@ -0,0 +1,30 @@
+From c39115ed52359eb5f0475ea2b4a2e71acb5da54b Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami at gmail.com>
+Date: Thu, 7 Nov 2013 23:17:36 +0100
+Subject: [PATCH] cfi_util.c: force CFI detection even if Q R Y test
+ fails
+
+Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
+---
+ drivers/mtd/chips/cfi_util.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
+index f992418..bdee7b9 100644
+--- a/drivers/mtd/chips/cfi_util.c
++++ b/drivers/mtd/chips/cfi_util.c
+@@ -85,7 +85,10 @@ int __xipram cfi_qry_mode_on(uint32_t base, struct map_info *map,
+ 	if (cfi_qry_present(map, base, cfi))
+ 		return 1;
+ 	/* QRY not found */
+-	return 0;
++/*	return 0; */
++
++/*	FIXME: UGLY HACK: FORCE DETECTION */
++	return 1;
+ }
+ EXPORT_SYMBOL_GPL(cfi_qry_mode_on);
+ 
+-- 
+1.8.1.5
+
-- 
1.8.1.5