Browse Source

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 <[email protected]>

SVN-Revision: 33971
Gabor Juhos 13 years ago
parent
commit
a6549ac1cb

+ 0 - 1
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;
 

+ 0 - 1
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);
 

+ 0 - 1
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;
 

+ 11 - 0
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;
+ 

+ 11 - 0
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);
+ 

+ 11 - 0
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;
+