adm5120: remove NAND_NO_AUTOINCR flag from rb1xx.c

Also add a compatibility patch for 3.3.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

SVN-Revision: 34950
owl
Gabor Juhos 2013-01-01 13:15:30 +00:00
parent 03e09078dc
commit 92cd48e9ea
2 changed files with 11 additions and 1 deletions

View File

@ -83,7 +83,6 @@ struct platform_nand_data rb1xx_nand_data __initdata = {
.nr_partitions = ARRAY_SIZE(rb1xx_nand_parts), .nr_partitions = ARRAY_SIZE(rb1xx_nand_parts),
.partitions = rb1xx_nand_parts, .partitions = rb1xx_nand_parts,
.chip_delay = RB1XX_NAND_CHIP_DELAY, .chip_delay = RB1XX_NAND_CHIP_DELAY,
.options = NAND_NO_AUTOINCR,
.chip_fixup = rb1xx_nand_fixup, .chip_fixup = rb1xx_nand_fixup,
}, },
}; };

View File

@ -0,0 +1,11 @@
reverted:
--- b/arch/mips/adm5120/mikrotik/rb-1xx.c
+++ a/arch/mips/adm5120/mikrotik/rb-1xx.c
@@ -83,6 +83,7 @@
.nr_partitions = ARRAY_SIZE(rb1xx_nand_parts),
.partitions = rb1xx_nand_parts,
.chip_delay = RB1XX_NAND_CHIP_DELAY,
+ .options = NAND_NO_AUTOINCR,
.chip_fixup = rb1xx_nand_fixup,
},
};