diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2013-10-24 13:50:11 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2013-10-24 13:50:11 +0000 |
commit | e72c7e17a475c00134c56f4392578ddc16a47a2e (patch) | |
tree | 842835f958f9c9ed315cb853173d51e43f76bbf5 /target/linux/generic/patches-3.12/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch | |
parent | 4341ea40379ed24c103e37b75661c62bfc3270f6 (diff) | |
download | mtk-20170518-e72c7e17a475c00134c56f4392578ddc16a47a2e.zip mtk-20170518-e72c7e17a475c00134c56f4392578ddc16a47a2e.tar.gz mtk-20170518-e72c7e17a475c00134c56f4392578ddc16a47a2e.tar.bz2 |
preliminary 3.12 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 38528
Diffstat (limited to 'target/linux/generic/patches-3.12/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch')
-rw-r--r-- | target/linux/generic/patches-3.12/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.12/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch b/target/linux/generic/patches-3.12/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch new file mode 100644 index 0000000..da480e2 --- /dev/null +++ b/target/linux/generic/patches-3.12/450-mtd-nand-allow-to-use-platform-specific-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 +@@ -722,6 +722,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; + } |