aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-06-07 08:35:09 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-06-07 08:35:09 +0000
commit825a171096bdf505d454eee555f6371007a89f68 (patch)
tree8ccda77d542c67e52c7bdf88ad698d858bba5a3b
parent894c20123fde76110fe48f941444f88f60bcd46d (diff)
downloadupstream-825a171096bdf505d454eee555f6371007a89f68.tar.gz
upstream-825a171096bdf505d454eee555f6371007a89f68.tar.bz2
upstream-825a171096bdf505d454eee555f6371007a89f68.zip
[kernel] add a chip_fixup function to the plat_nand driver on 2.6.23 as well (closes #3513)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11386 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic-2.6/patches-2.6.23/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.23/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.23/080-mtd_plat_nand_chip_fixup.patch
new file mode 100644
index 0000000000..4653898cba
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.23/080-mtd_plat_nand_chip_fixup.patch
@@ -0,0 +1,32 @@
+--- a/include/linux/mtd/nand.h
++++ b/include/linux/mtd/nand.h
+@@ -572,6 +572,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
+@@ -70,7 +70,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;
+ }