From ca706d1e01677b1519bb43e34f185559f300a805 Mon Sep 17 00:00:00 2001 From: juhosg Date: Sun, 28 Oct 2012 12:21:15 +0000 Subject: 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 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33971 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/files/drivers/mtd/nand/ar934x_nfc.c | 1 - target/linux/ar71xx/files/drivers/mtd/nand/rb4xx_nand.c | 1 - target/linux/ar71xx/files/drivers/mtd/nand/rb750_nand.c | 1 - .../patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch | 11 +++++++++++ .../patches-3.3/a03-rb4xx_nand-add-NO_AUTOINCR-flag.patch | 11 +++++++++++ .../patches-3.3/a04-rb750_nand-add-NO_AUTOINCR-flag.patch | 11 +++++++++++ 6 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 target/linux/ar71xx/patches-3.3/a02-ar934x_nfc-add-NO_AUTOINCR-flag.patch create mode 100644 target/linux/ar71xx/patches-3.3/a03-rb4xx_nand-add-NO_AUTOINCR-flag.patch create mode 100644 target/linux/ar71xx/patches-3.3/a04-rb750_nand-add-NO_AUTOINCR-flag.patch (limited to 'target/linux/ar71xx') 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 9bc9b125f..9434d0fe0 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 1cb8f8240..325504313 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 251e18220..9a0eadb93 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 000000000..fad9eacb3 --- /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 000000000..ad4a4b9e7 --- /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 000000000..0b0dfe6c8 --- /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; + -- cgit v1.2.3