diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 15:20:39 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2015-01-25 15:20:39 +0000 |
commit | d26694243af236fed09a4b38f3cc68e40ad063b5 (patch) | |
tree | df356ae59718ae0996986ccb61155243098dbc3f /target/linux/generic/patches-3.19/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch | |
parent | a46bb6ec6a0ed6eb56dc2f4551a57e63a7292753 (diff) | |
download | master-31e0f0ae-d26694243af236fed09a4b38f3cc68e40ad063b5.tar.gz master-31e0f0ae-d26694243af236fed09a4b38f3cc68e40ad063b5.tar.bz2 master-31e0f0ae-d26694243af236fed09a4b38f3cc68e40ad063b5.zip |
generic: add preliminary 3.19 support
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 44126
Diffstat (limited to 'target/linux/generic/patches-3.19/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch')
-rw-r--r-- | target/linux/generic/patches-3.19/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.19/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch b/target/linux/generic/patches-3.19/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch new file mode 100644 index 0000000000..ffaf70696e --- /dev/null +++ b/target/linux/generic/patches-3.19/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 +@@ -865,6 +865,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 +@@ -90,7 +90,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; + } |