aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-07-25 19:37:29 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-07-25 19:37:29 +0000
commit7ec71fbbfe7372bf435f2a4d5c456d01afceae7f (patch)
treec7a7a2a9095292aaae9457342fbaeca1c5a220c2
parent0ead72668a589118360bfe8dc34fd296e2cb8469 (diff)
downloadmaster-187ad058-7ec71fbbfe7372bf435f2a4d5c456d01afceae7f.tar.gz
master-187ad058-7ec71fbbfe7372bf435f2a4d5c456d01afceae7f.tar.bz2
master-187ad058-7ec71fbbfe7372bf435f2a4d5c456d01afceae7f.zip
[kernel] add chip_fixup patch of the platform_nand driver to 2.6.26 as well
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11922 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/patches-2.6.26/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.26/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.26/080-mtd_plat_nand_chip_fixup.patch
new file mode 100644
index 0000000000..a263093c0e
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.26/080-mtd_plat_nand_chip_fixup.patch
@@ -0,0 +1,32 @@
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -573,6 +573,7 @@
+ 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 @@
+ 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;
+ }