diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 09:01:33 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-06 09:01:33 +0000 |
| commit | 577ce6c8b529f16e2a962574d5e94844f8c5557f (patch) | |
| tree | 3fefe7ec2b73e99caab3a8f8c969d30fa62ba1da /target | |
| parent | db4cd8515c1076aee2517a51e4f57c7f74ae31a5 (diff) | |
| download | upstream-577ce6c8b529f16e2a962574d5e94844f8c5557f.tar.gz upstream-577ce6c8b529f16e2a962574d5e94844f8c5557f.tar.bz2 upstream-577ce6c8b529f16e2a962574d5e94844f8c5557f.zip | |
add a chip_fixup function to the plat_nand driver
SVN-Revision: 11375
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch | 32 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch | 32 |
2 files changed, 64 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..ef885edac3 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.24/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 +@@ -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; + } diff --git a/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..ef885edac3 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.25/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 +@@ -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; + } |