diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2012-10-28 12:21:15 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2012-10-28 12:21:15 +0000 |
| commit | 1517cc75d20dcca47f9dd3b5d7457fec9bba5e83 (patch) | |
| tree | 26e5bf0e6ac4fe0be168715a6f8e7b906f4f7e4b /target | |
| parent | 7a14817d2d032a15d3bafaf7c056281a80cd12fe (diff) | |
| download | master-187ad058-1517cc75d20dcca47f9dd3b5d7457fec9bba5e83.tar.gz master-187ad058-1517cc75d20dcca47f9dd3b5d7457fec9bba5e83.tar.bz2 master-187ad058-1517cc75d20dcca47f9dd3b5d7457fec9bba5e83.zip | |
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33971 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
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 9bc9b125f4..9434d0fe06 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 1cb8f82407..3255043133 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 251e182208..9a0eadb93d 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 0000000000..fad9eacb3b --- /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 0000000000..ad4a4b9e7b --- /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 0000000000..0b0dfe6c89 --- /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; + |