summaryrefslogtreecommitdiff
path: root/target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2015-08-09 12:25:18 +0000
committerZoltan Herpai <wigyori@uid0.hu>2015-08-09 12:25:18 +0000
commit50018a752771efce3ae222457d4d231d1f80a1a5 (patch)
treeced2b9c1e216ce0e3d0bb204e359a7a9d6d2a3ef /target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch
parent0b8643af4fa7eebd55b63d6d547f85da1409f83d (diff)
downloadmtk-20170518-50018a752771efce3ae222457d4d231d1f80a1a5.zip
mtk-20170518-50018a752771efce3ae222457d4d231d1f80a1a5.tar.gz
mtk-20170518-50018a752771efce3ae222457d4d231d1f80a1a5.tar.bz2
sunxi: add support for 4.1
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> SVN-Revision: 46571
Diffstat (limited to 'target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch')
-rw-r--r--target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch43
1 files changed, 43 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch b/target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch
new file mode 100644
index 0000000..4ff54d7
--- /dev/null
+++ b/target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch
@@ -0,0 +1,43 @@
+From f8ff99a839ed05e1e4993b543357183b095b77f1 Mon Sep 17 00:00:00 2001
+From: Michal Suchanek <hramrach@gmail.com>
+Date: Thu, 1 Jan 2015 16:44:45 +0100
+Subject: [PATCH] mtd: nand: Fix NAND_* options to use unique values.
+
+NAND_BUSWIDTH_AUTO (64b37b2a6) and NAND_USE_BOUNCE_BUFFER (66507c7bc)
+are the same value. Change the later introduced NAND_USE_BOUNCE_BUFFER
+to a different value.
+
+Signed-off-by: Michal Suchanek <hramrach@gmail.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+---
+ include/linux/mtd/nand.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
+index 328aab2..c20f35b 100644
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -176,17 +176,17 @@ typedef enum {
+ /* Chip may not exist, so silence any errors in scan */
+ #define NAND_SCAN_SILENT_NODEV 0x00040000
+ /*
+- * This option could be defined by controller drivers to protect against
+- * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
+- */
+-#define NAND_USE_BOUNCE_BUFFER 0x00080000
+-/*
+ * Autodetect nand buswidth with readid/onfi.
+ * This suppose the driver will configure the hardware in 8 bits mode
+ * when calling nand_scan_ident, and update its configuration
+ * before calling nand_scan_tail.
+ */
+-#define NAND_BUSWIDTH_AUTO 0x00080000
++#define NAND_BUSWIDTH_AUTO 0x00080000
++/*
++ * This option could be defined by controller drivers to protect against
++ * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
++ */
++#define NAND_USE_BOUNCE_BUFFER 0x00100000
+
+ /* Options set by nand scan */
+ /* Nand scan has allocated controller struct */