summaryrefslogtreecommitdiff
path: root/target/linux/ar71xx
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-10-28 12:21:15 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-10-28 12:21:15 +0000
commita6549ac1cbe00295dcf8274eeba09effb5103d4a (patch)
tree6a978c642a68b1b53e2aec7f7d1d10c36268c1b2 /target/linux/ar71xx
parent9a37cf7ec68590d341c777f33f2ae6e5f9ef92bc (diff)
downloadmtk-20170518-a6549ac1cbe00295dcf8274eeba09effb5103d4a.zip
mtk-20170518-a6549ac1cbe00295dcf8274eeba09effb5103d4a.tar.gz
mtk-20170518-a6549ac1cbe00295dcf8274eeba09effb5103d4a.tar.bz2
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
Diffstat (limited to 'target/linux/ar71xx')
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c1
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c1
-rw-r--r--target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c1
-rw-r--r--target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch11
-rw-r--r--target/linux/ar71xx/patches-3.3/a03-rb4xx_nand-add-NO_AUTOINCR-flag.patch11
-rw-r--r--target/linux/ar71xx/patches-3.3/a04-rb750_nand-add-NO_AUTOINCR-flag.patch11
6 files changed, 33 insertions, 3 deletions
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 9bc9b12..9434d0f 100644
--- 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 1cb8f82..3255043 100644
--- 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 251e182..9a0eadb 100644
--- 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
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
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
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;
+