target/linux/sunxi/patches-4.1/118-mtd-nand-fix-NAND_options.patch

   1 From f8ff99a839ed05e1e4993b543357183b095b77f1 Mon Sep 17 00:00:00 2001
   2 From: Michal Suchanek <hramrach@gmail.com>
   3 Date: Thu, 1 Jan 2015 16:44:45 +0100
   4 Subject: [PATCH] mtd: nand: Fix NAND_* options to use unique values.
   5
   6 NAND_BUSWIDTH_AUTO (64b37b2a6) and NAND_USE_BOUNCE_BUFFER (66507c7bc)
   7 are the same value. Change the later introduced NAND_USE_BOUNCE_BUFFER
   8 to a different value.
   9
  10 Signed-off-by: Michal Suchanek <hramrach@gmail.com>
  11 Signed-off-by: Hans de Goede <hdegoede@redhat.com>
  12 ---
  13  include/linux/mtd/nand.h | 12 ++++++------
  14  1 file changed, 6 insertions(+), 6 deletions(-)
  15
  16 --- a/include/linux/mtd/nand.h
  17 +++ b/include/linux/mtd/nand.h
  18 @@ -176,17 +176,17 @@ typedef enum {
  19  /* Chip may not exist, so silence any errors in scan */
  20  #define NAND_SCAN_SILENT_NODEV 0x00040000
  21  /*
  22 - * This option could be defined by controller drivers to protect against
  23 - * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
  24 - */
  25 -#define NAND_USE_BOUNCE_BUFFER 0x00080000
  26 -/*
  27   * Autodetect nand buswidth with readid/onfi.
  28   * This suppose the driver will configure the hardware in 8 bits mode
  29   * when calling nand_scan_ident, and update its configuration
  30   * before calling nand_scan_tail.
  31   */
  32 -#define NAND_BUSWIDTH_AUTO      0x00080000
  33 +#define NAND_BUSWIDTH_AUTO     0x00080000
  34 +/*
  35 + * This option could be defined by controller drivers to protect against
  36 + * kmap'ed, vmalloc'ed highmem buffers being passed from upper layers
  37 + */
  38 +#define NAND_USE_BOUNCE_BUFFER 0x00100000
  39
  40  /* Options set by nand scan */
  41  /* Nand scan has allocated controller struct */