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

Commit 1826dbcc authored by Brian Norris's avatar Brian Norris Committed by David Woodhouse
Browse files

mtd: nand: kill NAND_NO_AUTOINCR option 



No drivers use auto-increment NAND, so kill the NO_AUTOINCR option entirely.

Signed-off-by: default avatarBrian Norris <computersforpeace@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent c00a0991

Documentation/DocBook/mtdnand.tmpl

+0 −2
Original line number Diff line number Diff line
@@ -1119,8 +1119,6 @@ in this page</entry> 
		These constants are defined in nand.h. They are ored together to describe

		the chip functionality.

     		<programlisting>

/* Chip can not auto increment pages */

#define NAND_NO_AUTOINCR	0x00000001

/* Buswitdh is 16 bit */

#define NAND_BUSWIDTH_16	0x00000002

/* Device supports partial programming without padding */

arch/arm/mach-ep93xx/snappercl15.c

+0 −1
Original line number Diff line number Diff line
@@ -100,7 +100,6 @@ static struct platform_nand_data snappercl15_nand_data = { 
		.nr_chips		= 1,

		.partitions		= snappercl15_nand_parts,

		.nr_partitions		= ARRAY_SIZE(snappercl15_nand_parts),

		.options		= NAND_NO_AUTOINCR,

		.chip_delay		= 25,

	},

	.ctrl = {

arch/arm/mach-ixp4xx/ixdp425-setup.c

+0 −1
Original line number Diff line number Diff line
@@ -98,7 +98,6 @@ static struct platform_nand_data ixdp425_flash_nand_data = { 
	.chip = {

		.nr_chips		= 1,

		.chip_delay		= 30,

		.options		= NAND_NO_AUTOINCR,

		.partitions	 	= ixdp425_partitions,

		.nr_partitions	 	= ARRAY_SIZE(ixdp425_partitions),

	},

arch/arm/mach-nomadik/board-nhk8815.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static struct nomadik_nand_platform_data nhk8815_nand_data = { 
	.parts		= nhk8815_partitions,

	.nparts		= ARRAY_SIZE(nhk8815_partitions),

	.options	= NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \

			| NAND_NO_READRDY | NAND_NO_AUTOINCR,

			| NAND_NO_READRDY,

	.init		= nhk8815_nand_init,

};

arch/mips/rb532/devices.c

+0 −1
Original line number Diff line number Diff line
@@ -292,7 +292,6 @@ static void __init rb532_nand_setup(void) 
	rb532_nand_data.chip.nr_partitions = ARRAY_SIZE(rb532_partition_info);

	rb532_nand_data.chip.partitions = rb532_partition_info;

	rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;

	rb532_nand_data.chip.options = NAND_NO_AUTOINCR;

}