summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2009-04-28 13:35:14 +0000
committerImre Kaloz <kaloz@openwrt.org>2009-04-28 13:35:14 +0000
commit2d0ccf7f5e0d98cb621550f88f19f7380fc06728 (patch)
tree9b1bdaac0af6496bf8da5f128461aeb79cd778c8 /target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch
parentf87df4b3615bc4e0bd9e19671f942f23782fb2ff (diff)
downloadmaster-31e0f0ae-2d0ccf7f5e0d98cb621550f88f19f7380fc06728.tar.gz
master-31e0f0ae-2d0ccf7f5e0d98cb621550f88f19f7380fc06728.tar.bz2
master-31e0f0ae-2d0ccf7f5e0d98cb621550f88f19f7380fc06728.zip
preliminary 2.6.30 support
SVN-Revision: 15468
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch32
1 files changed, 32 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch
new file mode 100644
index 0000000000..8b6256af8f
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.30/080-mtd_plat_nand_chip_fixup.patch
@@ -0,0 +1,32 @@
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -574,6 +574,7 @@ struct platform_nand_chip {
+ int chip_delay;
+ unsigned int options;
+ const char **part_probe_types;
++ int (*chip_fixup)(struct mtd_info *mtd);
+ void *priv;
+ };
+
+--- a/drivers/mtd/nand/plat_nand.c
++++ b/drivers/mtd/nand/plat_nand.c
+@@ -71,7 +71,18 @@ static int __devinit plat_nand_probe(str
+ platform_set_drvdata(pdev, data);
+
+ /* Scan to find existance of the device */
+- if (nand_scan(&data->mtd, 1)) {
++ if (nand_scan_ident(&data->mtd, 1)) {
++ res = -ENXIO;
++ goto out;
++ }
++
++ if (pdata->chip.chip_fixup) {
++ res = pdata->chip.chip_fixup(&data->mtd);
++ if (res)
++ goto out;
++ }
++
++ if (nand_scan_tail(&data->mtd)) {
+ res = -ENXIO;
+ goto out;
+ }