diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2012-11-18 18:52:38 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2012-11-18 18:52:38 +0000 |
commit | 935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0 (patch) | |
tree | 48e34d859046c692a221dddd165db5abc37feb90 /target/linux/generic/patches-3.7/450-mtd_plat_nand_chip_fixup.patch | |
parent | d0226aff1d62d39530819938ac116ee3cbb93efa (diff) | |
download | mtk-20170518-935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0.zip mtk-20170518-935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0.tar.gz mtk-20170518-935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0.tar.bz2 |
add 3.7-rc6 support (patch 820 still has to be fixed)
SVN-Revision: 34247
Diffstat (limited to 'target/linux/generic/patches-3.7/450-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-3.7/450-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.7/450-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000..5dca843 --- /dev/null +++ b/target/linux/generic/patches-3.7/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 +@@ -640,6 +640,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 __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)) { ++ 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; + } |