ar71xx: remove NO_AUTOINCR flag from the NAND drivers

The flag is not present in 3.6.
Also add compatibility patches for 3.3.

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

diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c b/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
index 9bc9b125f46ebdb166bc47ebf543f10b50807d71..9434d0fe0610036d6b1c723742483c61fff84da7 100644 (file)
--- a/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c
@@ -1051,7 +1051,6 @@ ar934x_nfc_probe(struct platform_device *pdev)
        else
                mtd->name = dev_name(&pdev->dev);
 
-       nand->options = NAND_NO_AUTOINCR;
        nand->chip_delay = 25;
        nand->ecc.mode = NAND_ECC_SOFT;
 

diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
index 1cb8f82407d3afa2bba3b28a4dd32dafe643e5c7..3255043133bec22b62b1d68375687f44880b15c4 100644 (file)
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c
@@ -221,7 +221,6 @@ static int __devinit rb4xx_nand_probe(struct platform_device *pdev)
 
        info->chip.chip_delay   = 25;
        info->chip.ecc.mode     = NAND_ECC_SOFT;
-       info->chip.options      |= NAND_NO_AUTOINCR;
 
        platform_set_drvdata(pdev, info);
 

diff --git a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
index 251e1822088bf5f93e54d147221816f6da05af00..9a0eadb93d291e5ae33b5061c47dcbfba236a854 100644 (file)
--- a/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
+++ b/target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c
@@ -289,7 +289,6 @@ static int __devinit rb750_nand_probe(struct platform_device *pdev)
 
        info->chip.chip_delay   = 25;
        info->chip.ecc.mode     = NAND_ECC_SOFT;
-       info->chip.options      |= NAND_NO_AUTOINCR;
 
        info->pdata = pdata;
 

diff --git a/target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch b/target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch
new file mode 100644 (file)
index 0000000..fad9eac
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch
@@ -0,0 +1,11 @@
+reverted:
+--- a/drivers/mtd/nand/ar934x_nfc.c
++++ b/drivers/mtd/nand/ar934x_nfc.c
+@@ -1051,6 +1051,7 @@ ar934x_nfc_probe(struct platform_device
+       else
+               mtd->name = dev_name(&pdev->dev);
+ 
++      nand->options = NAND_NO_AUTOINCR;
+       nand->chip_delay = 25;
+       nand->ecc.mode = NAND_ECC_SOFT;
+ 

diff --git a/target/linux/ar71xx/patches-3.3/a03-rb4xx_nand-add-NO_AUTOINCR-flag.patch b/target/linux/ar71xx/patches-3.3/a03-rb4xx_nand-add-NO_AUTOINCR-flag.patch
new file mode 100644 (file)
index 0000000..ad4a4b9
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.3/a03-rb4xx_nand-add-NO_AUTOINCR-flag.patch
@@ -0,0 +1,11 @@
+reverted:
+--- a/drivers/mtd/nand/rb4xx_nand.c
++++ b/drivers/mtd/nand/rb4xx_nand.c
+@@ -221,6 +221,7 @@ static int __devinit rb4xx_nand_probe(st
+ 
+       info->chip.chip_delay   = 25;
+       info->chip.ecc.mode     = NAND_ECC_SOFT;
++      info->chip.options      |= NAND_NO_AUTOINCR;
+ 
+       platform_set_drvdata(pdev, info);
+ 

diff --git a/target/linux/ar71xx/patches-3.3/a04-rb750_nand-add-NO_AUTOINCR-flag.patch b/target/linux/ar71xx/patches-3.3/a04-rb750_nand-add-NO_AUTOINCR-flag.patch
new file mode 100644 (file)
index 0000000..0b0dfe6
--- /dev/null
+++ b/target/linux/ar71xx/patches-3.3/a04-rb750_nand-add-NO_AUTOINCR-flag.patch
@@ -0,0 +1,11 @@
+reverted:
+--- a/drivers/mtd/nand/rb750_nand.c
++++ b/drivers/mtd/nand/rb750_nand.c
+@@ -289,6 +289,7 @@ static int __devinit rb750_nand_probe(st
+ 
+       info->chip.chip_delay   = 25;
+       info->chip.ecc.mode     = NAND_ECC_SOFT;
++      info->chip.options      |= NAND_NO_AUTOINCR;
+ 
+       info->pdata = pdata;
+