[oe] [meta-handheld][PATCH 1/2] linux-yocto*: mtd: collie: refactor headers of collie-match-cfi-qry.patch

[Andrea Adami]

Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
---
 .../patches/patches-mtd/collie-match-cfi-qry.patch    | 19 ++++++++++++++++---
 .../patches/patches-mtd/collie-match-cfi-qry.patch    | 19 ++++++++++++++++---
 .../patches/patches-mtd/collie-match-cfi-qry.patch    | 19 ++++++++++++++++---
 3 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-match-cfi-qry.patch b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-match-cfi-qry.patch
index e3fbf2e..a315d93 100644
--- a/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-match-cfi-qry.patch
+++ b/recipes-kernel/linux/linux-yocto-3.10/patches/patches-mtd/collie-match-cfi-qry.patch
@@ -1,8 +1,18 @@
+From 66ec11df6561d5ba7cdf41977af828a53ba6b99f Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami at gmail.com>
+Date: Sat, 1 Feb 2014 13:17:24 +0100
+Subject: [PATCH] mtd: cfi_util.c: force CFI detection of 2x LH28F640BF
+
+Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
+---
+ drivers/mtd/chips/cfi_util.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
 diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
-index f992418..7139d028 100644
+index f992418..2c7a13d 100644
 --- a/drivers/mtd/chips/cfi_util.c
 +++ b/drivers/mtd/chips/cfi_util.c
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,7 @@ int __xipram cfi_qry_present(struct map_info *map, __u32 base,
  	int osf = cfi->interleave * cfi->device_type;	/* scale factor */
  	map_word val[3];
  	map_word qry[3];
@@ -10,7 +20,7 @@ index f992418..7139d028 100644
  
  	qry[0] = cfi_build_cmd('Q', map, cfi);
  	qry[1] = cfi_build_cmd('R', map, cfi);
-@@ -38,6 +39,21 @@
+@@ -38,6 +39,21 @@ int __xipram cfi_qry_present(struct map_info *map, __u32 base,
  	val[1] = map_read(map, base + osf*0x11);
  	val[2] = map_read(map, base + osf*0x12);
  
@@ -32,3 +42,6 @@ index f992418..7139d028 100644
  	if (!map_word_equal(map, qry[0], val[0]))
  		return 0;
  
+-- 
+1.8.1.5
+
diff --git a/recipes-kernel/linux/linux-yocto-dev/patches/patches-mtd/collie-match-cfi-qry.patch b/recipes-kernel/linux/linux-yocto-dev/patches/patches-mtd/collie-match-cfi-qry.patch
index e3fbf2e..a315d93 100644
--- a/recipes-kernel/linux/linux-yocto-dev/patches/patches-mtd/collie-match-cfi-qry.patch
+++ b/recipes-kernel/linux/linux-yocto-dev/patches/patches-mtd/collie-match-cfi-qry.patch
@@ -1,8 +1,18 @@
+From 66ec11df6561d5ba7cdf41977af828a53ba6b99f Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami at gmail.com>
+Date: Sat, 1 Feb 2014 13:17:24 +0100
+Subject: [PATCH] mtd: cfi_util.c: force CFI detection of 2x LH28F640BF
+
+Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
+---
+ drivers/mtd/chips/cfi_util.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
 diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
-index f992418..7139d028 100644
+index f992418..2c7a13d 100644
 --- a/drivers/mtd/chips/cfi_util.c
 +++ b/drivers/mtd/chips/cfi_util.c
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,7 @@ int __xipram cfi_qry_present(struct map_info *map, __u32 base,
  	int osf = cfi->interleave * cfi->device_type;	/* scale factor */
  	map_word val[3];
  	map_word qry[3];
@@ -10,7 +20,7 @@ index f992418..7139d028 100644
  
  	qry[0] = cfi_build_cmd('Q', map, cfi);
  	qry[1] = cfi_build_cmd('R', map, cfi);
-@@ -38,6 +39,21 @@
+@@ -38,6 +39,21 @@ int __xipram cfi_qry_present(struct map_info *map, __u32 base,
  	val[1] = map_read(map, base + osf*0x11);
  	val[2] = map_read(map, base + osf*0x12);
  
@@ -32,3 +42,6 @@ index f992418..7139d028 100644
  	if (!map_word_equal(map, qry[0], val[0]))
  		return 0;
  
+-- 
+1.8.1.5
+
diff --git a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-match-cfi-qry.patch b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-match-cfi-qry.patch
index e3fbf2e..a315d93 100644
--- a/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-match-cfi-qry.patch
+++ b/recipes-kernel/linux/linux-yocto-tiny-kexecboot-3.10/patches/patches-mtd/collie-match-cfi-qry.patch
@@ -1,8 +1,18 @@
+From 66ec11df6561d5ba7cdf41977af828a53ba6b99f Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami at gmail.com>
+Date: Sat, 1 Feb 2014 13:17:24 +0100
+Subject: [PATCH] mtd: cfi_util.c: force CFI detection of 2x LH28F640BF
+
+Signed-off-by: Andrea Adami <andrea.adami at gmail.com>
+---
+ drivers/mtd/chips/cfi_util.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
 diff --git a/drivers/mtd/chips/cfi_util.c b/drivers/mtd/chips/cfi_util.c
-index f992418..7139d028 100644
+index f992418..2c7a13d 100644
 --- a/drivers/mtd/chips/cfi_util.c
 +++ b/drivers/mtd/chips/cfi_util.c
-@@ -29,6 +29,7 @@
+@@ -29,6 +29,7 @@ int __xipram cfi_qry_present(struct map_info *map, __u32 base,
  	int osf = cfi->interleave * cfi->device_type;	/* scale factor */
  	map_word val[3];
  	map_word qry[3];
@@ -10,7 +20,7 @@ index f992418..7139d028 100644
  
  	qry[0] = cfi_build_cmd('Q', map, cfi);
  	qry[1] = cfi_build_cmd('R', map, cfi);
-@@ -38,6 +39,21 @@
+@@ -38,6 +39,21 @@ int __xipram cfi_qry_present(struct map_info *map, __u32 base,
  	val[1] = map_read(map, base + osf*0x11);
  	val[2] = map_read(map, base + osf*0x12);
  
@@ -32,3 +42,6 @@ index f992418..7139d028 100644
  	if (!map_word_equal(map, qry[0], val[0]))
  		return 0;
  
+-- 
+1.8.1.5
+
-- 
1.8.1.5