From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 1 Jan 2013 13:15:30 +0000 (+0000)
Subject: adm5120: remove NAND_NO_AUTOINCR flag from rb1xx.c
X-Git-Tag: fast2504n-3.10.28-merged~3874
X-Git-Url: https://git.enpas.org/?a=commitdiff_plain;h=24ca6088f80983f9d4c8710d58097d40a7522aa4;p=openwrt.git

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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34950 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

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 2ad8c42200..8961115c7e 100644
--- 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
index 0000000000..3aa4fa9d40
--- /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,
+ 	},
+ };