mtd: nand: kill NAND_NO_AUTOINCR option

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

Signed-off-by: Brian Norris <computersforpeace@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

4 files changed, 1 insertions, 4 deletions

diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c
index 5df9092f1fcc..376b8f5ecfa3 100644
--- a/arch/arm/mach-ep93xx/snappercl15.c
+++ b/arch/arm/mach-ep93xx/snappercl15.c
@@ -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 = {
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index fccfc73e69f1..108a9d3f382d 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -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),
         },
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c
index 58cacafcf662..2e8d3e176bc7 100644
--- a/arch/arm/mach-nomadik/board-nhk8815.c
+++ b/arch/arm/mach-nomadik/board-nhk8815.c
@@ -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,
 };
 
diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index a969eb826634..08c4f8e03ffe 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -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;
 }