diff options
author | Imre Kaloz <kaloz@openwrt.org> | 2012-10-23 12:21:34 +0000 |
---|---|---|
committer | Imre Kaloz <kaloz@openwrt.org> | 2012-10-23 12:21:34 +0000 |
commit | 949b46d13d1e21b596f505a2e69956565e365d77 (patch) | |
tree | 4b51f4852224df7cc2d056071ee51bfcb9c5b7f4 /target/linux/generic/patches-3.6/450-mtd_plat_nand_chip_fixup.patch | |
parent | 0d2cf5f9e363c8e41b32921b0ab2aa3d4621dfd5 (diff) | |
download | upstream-949b46d13d1e21b596f505a2e69956565e365d77.tar.gz upstream-949b46d13d1e21b596f505a2e69956565e365d77.tar.bz2 upstream-949b46d13d1e21b596f505a2e69956565e365d77.zip |
linux 3.6 support (work in progress)
SVN-Revision: 33897
Diffstat (limited to 'target/linux/generic/patches-3.6/450-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-3.6/450-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.6/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.6/450-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..fd2b9b57b9 --- /dev/null +++ b/target/linux/generic/patches-3.6/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 +@@ -622,6 +622,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 +@@ -93,7 +93,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; + } |