From 3c5635a3aa3dd00eb47cf0191588ed64f6d10f29 Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Sun, 19 May 2013 18:36:15 +0000 Subject: kernel: generic: add 3.10-rc1 support Signed-off-by: Jonas Gorski git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36663 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../450-mtd_plat_nand_chip_fixup.patch | 37 ++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 target/linux/generic/patches-3.10/450-mtd_plat_nand_chip_fixup.patch (limited to 'target/linux/generic/patches-3.10/450-mtd_plat_nand_chip_fixup.patch') diff --git a/target/linux/generic/patches-3.10/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.10/450-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..af9389b53c --- /dev/null +++ b/target/linux/generic/patches-3.10/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 +@@ -655,6 +655,7 @@ struct platform_nand_chip { + unsigned int options; + unsigned int bbt_options; + const char **part_probe_types; ++ int (*chip_fixup)(struct mtd_info *mtd); + }; + + /* Keep gcc happy */ +--- a/drivers/mtd/nand/plat_nand.c ++++ b/drivers/mtd/nand/plat_nand.c +@@ -103,7 +103,18 @@ static int plat_nand_probe(struct platfo + } + + /* 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)) { ++ err = -ENXIO; ++ goto out; ++ } ++ ++ if (pdata->chip.chip_fixup) { ++ err = pdata->chip.chip_fixup(&data->mtd); ++ if (err) ++ goto out; ++ } ++ ++ if (nand_scan_tail(&data->mtd)) { + err = -ENXIO; + goto out; + } -- cgit v1.2.3