diff options
author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-21 17:52:22 +0000 |
---|---|---|
committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-21 17:52:22 +0000 |
commit | f6ceb966a6d45934fb5ebf157f4e4f30652ea8ca (patch) | |
tree | 7b8643b5144db15c53536abf69dec2a49aa31bef /target/linux/generic/patches-2.6.38/080-mtd_plat_nand_chip_fixup.patch | |
parent | 19cc42b1db6159cfc42c2b40aeb6b8042599a23f (diff) |
[target/generic]: preliminary 2.6.38 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25057 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.38/080-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.38/080-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.38/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.38/080-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..8ad32a8aad --- /dev/null +++ b/target/linux/generic/patches-2.6.38/080-mtd_plat_nand_chip_fixup.patch @@ -0,0 +1,37 @@ +--- + drivers/mtd/nand/plat_nand.c | 13 ++++++++++++- + include/linux/mtd/nand.h | 1 + + 2 files changed, 13 insertions(+), 1 deletion(-) + +--- a/include/linux/mtd/nand.h ++++ b/include/linux/mtd/nand.h +@@ -622,6 +622,7 @@ struct platform_nand_chip { + int chip_delay; + unsigned int options; + const char **part_probe_types; ++ int (*chip_fixup)(struct mtd_info *mtd); + void (*set_parts)(uint64_t size, struct platform_nand_chip *chip); + void *priv; + }; +--- a/drivers/mtd/nand/plat_nand.c ++++ b/drivers/mtd/nand/plat_nand.c +@@ -96,7 +96,18 @@ static int __devinit plat_nand_probe(str + } + + /* Scan to find existance of the device */ +- if (nand_scan(&data->mtd, pdata->chip.nr_chips)) { ++ if (nand_scan_ident(&data->mtd, pdata->chip.nr_chips, NULL)) { ++ 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)) { + err = -ENXIO; + goto out; + } |