diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-12 19:39:20 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-04-12 19:39:20 +0000 |
commit | cb86f32419462d984dfda5692e4f32ce577f451a (patch) | |
tree | b39442bafc4ffd370397f3d5caeb7fe639cb9a86 /target/linux/generic/patches-2.6.39/080-mtd_plat_nand_chip_fixup.patch | |
parent | 562ffbf7a2cb37b7036186bb3ef1127d694bf664 (diff) |
generic: Add support for 2.6.39
Add support for 2.6.39 based on rc3. Runtime tested on bcm63xx.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26615 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-2.6.39/080-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-2.6.39/080-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-2.6.39/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.39/080-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 000000000..0774e8389 --- /dev/null +++ b/target/linux/generic/patches-2.6.39/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 +@@ -625,6 +625,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 existence 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; + } |