Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5f867db6 authored by Scott Wood's avatar Scott Wood Committed by Brian Norris
Browse files

mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict 



Commit 66507c7b ("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.

Cc: Kamal Dasu <kdasu.kdev@gmail.com>
Fixes: 66507c7b ("mtd: nand: Add support to use nand_base
	poi databuf as bounce buffer")
Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
parent 159eeea4

include/linux/mtd/nand.h

+5 −5
Original line number Diff line number Diff line
@@ -177,11 +177,6 @@ typedef enum { 
#define NAND_OWN_BUFFERS	0x00020000

/* 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
@@ -189,6 +184,11 @@ typedef enum { 
 * 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 */