[PATCH] mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict

[Brian Norris]

On Fri, Jun 26, 2015 at 07:43:58PM -0500, Scott Wood wrote:
> Commit 66507c7bc8895f0da6b ("mtd: nand: Add support to use nand_base
> poi databuf as bounce buffer") added a flag NAND_USE_BOUNCE_BUFFER
> using the same bit value as the existing NAND_BUSWIDTH_AUTO.

Good catch. It'd probably be easier to catch these things if we didn't
just manually type these in hex. Perhaps BIT() would make this more
obvious?

Anyway, looks good. Pushed to linux-mtd.git.

Brian

> Cc: Kamal Dasu <kdasu.kdev at gmail.com>
> Fixes: 66507c7bc8895f0da6b ("mtd: nand: Add support to use nand_base
> 	poi databuf as bounce buffer")
> Signed-off-by: Scott Wood <scottwood at freescale.com>
> ---
>  include/linux/mtd/nand.h | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
> index 3d4ea7e..12b75f3 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
> +/*
> + * 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 */
> -- 
> 2.1.4
>