diff options
author | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:36:15 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2013-05-19 18:36:15 +0000 |
commit | c0435a971e9c21ebf694b221717e7a73f12662ec (patch) | |
tree | 6daa92bd257c9376af180e7bb3649dca91589812 /target/linux/generic/patches-3.10/450-mtd_plat_nand_chip_fixup.patch | |
parent | 87203c404996884334a9584fce0d8a251bf9fb43 (diff) | |
download | master-31e0f0ae-c0435a971e9c21ebf694b221717e7a73f12662ec.tar.gz master-31e0f0ae-c0435a971e9c21ebf694b221717e7a73f12662ec.tar.bz2 master-31e0f0ae-c0435a971e9c21ebf694b221717e7a73f12662ec.zip |
kernel: generic: add 3.10-rc1 support
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 36663
Diffstat (limited to 'target/linux/generic/patches-3.10/450-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-3.10/450-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
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; + } |