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

diff --git a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c
index 2ad8c42200be6bcc5df103550d3c28a4cb4473d1..8961115c7e2dbe1b8fed7ecf609f23340ac9f3bf 100644 (file)
--- a/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c
+++ b/target/linux/adm5120/files/arch/mips/adm5120/mikrotik/rb-1xx.c
@@ -83,7 +83,6 @@ struct platform_nand_data rb1xx_nand_data __initdata = {
                .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,
        },
 };

diff --git a/target/linux/adm5120/patches-3.3/a01-rb1xx-nand-add-NAND_NO_AUTOINCR-flag.patch b/target/linux/adm5120/patches-3.3/a01-rb1xx-nand-add-NAND_NO_AUTOINCR-flag.patch
new file mode 100644 (file)
index 0000000..3aa4fa9
--- /dev/null
+++ b/target/linux/adm5120/patches-3.3/a01-rb1xx-nand-add-NAND_NO_AUTOINCR-flag.patch
@@ -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,
+       },
+ };