From 4d4c41d673f9c3ebdb73c7d98c22df64d4310157 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 16 Apr 2011 18:31:21 +0000 Subject: kernel: reorganize 2.6.37 patches git-svn-id: svn://svn.openwrt.org/openwrt/trunk@26692 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../080-mtd_plat_nand_chip_fixup.patch | 37 ---------------------- 1 file changed, 37 deletions(-) delete mode 100644 target/linux/generic/patches-2.6.37/080-mtd_plat_nand_chip_fixup.patch (limited to 'target/linux/generic/patches-2.6.37/080-mtd_plat_nand_chip_fixup.patch') diff --git a/target/linux/generic/patches-2.6.37/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-2.6.37/080-mtd_plat_nand_chip_fixup.patch deleted file mode 100644 index 0558f52c7..000000000 --- a/target/linux/generic/patches-2.6.37/080-mtd_plat_nand_chip_fixup.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- - 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 -@@ -620,6 +620,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; - } -- cgit v1.2.3