Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mtd: nand: Fix NAND_USE_BOUNCE_BUFFER flag conflict

Browse source 
Commit 66507c7bc8 ("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: 66507c7bc8 ("mtd: nand: Add support to use nand_base
	poi databuf as bounce buffer")
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Brian Norris <computersforpeace@gmail.com>
This commit is contained in:
Scott Wood 2015-06-26 19:43:58 -05:00 committed by Brian Norris
parent 159eeea4cb
commit 5f867db634
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/linux/mtd/nand.h
View file

@ -177,11 +177,6 @@ typedef enum {
#define NAND_OWN_BUFFERS 0x00020000 #define NAND_OWN_BUFFERS 0x00020000
/* Chip may not exist, so silence any errors in scan */ /* Chip may not exist, so silence any errors in scan */
#define NAND_SCAN_SILENT_NODEV 0x00040000 #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. * Autodetect nand buswidth with readid/onfi.
* This suppose the driver will configure the hardware in 8 bits mode * This suppose the driver will configure the hardware in 8 bits mode
@ -189,6 +184,11 @@ typedef enum {
* before calling nand_scan_tail. * 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 */ /* Options set by nand scan */
/* Nand scan has allocated controller struct */ /* Nand scan has allocated controller struct */