diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2013-09-13 17:24:25 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2013-09-13 17:24:25 +0000 |
| commit | 2d49e32715b05280e6f6e3e0c0140f3a7423b951 (patch) | |
| tree | 4e72504855796fdf4c3bbb48da4e10e66a35ccb8 /target/linux/generic/patches-3.10/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch | |
| parent | ad1c38fe97958d5b6f1545c4e5ef12022f95b8e7 (diff) | |
| download | upstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.tar.gz upstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.tar.bz2 upstream-2d49e32715b05280e6f6e3e0c0140f3a7423b951.zip | |
generic/3.10: rename mtd patches
- change patch numbers to group the related stuff together,
- add mtd prefix where it is missing,
- use hyphens in the patch names
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
SVN-Revision: 37974
Diffstat (limited to 'target/linux/generic/patches-3.10/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch')
| -rw-r--r-- | target/linux/generic/patches-3.10/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.10/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch b/target/linux/generic/patches-3.10/450-mtd-nand-allow-to-use-platform-specific-chip-fixup.patch new file mode 100644 index 0000000000..af9389b53c --- /dev/null +++ b/target/linux/generic/patches-3.10/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 +@@ -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; + } |