From b460d9e23fe468d9d59394ea86f631150006ff6c Mon Sep 17 00:00:00 2001 From: jogo Date: Tue, 9 Aug 2011 12:19:43 +0000 Subject: linux: generic: add support for 3.1-rc1 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27940 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-3.1/450-mtd_plat_nand_chip_fixup.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 target/linux/generic/patches-3.1/450-mtd_plat_nand_chip_fixup.patch (limited to 'target/linux/generic/patches-3.1/450-mtd_plat_nand_chip_fixup.patch') diff --git a/target/linux/generic/patches-3.1/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.1/450-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 000000000..98b4c565e --- /dev/null +++ b/target/linux/generic/patches-3.1/450-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 +@@ -94,7 +94,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; + } -- cgit v1.2.3