diff options
author | Florian Fainelli <florian@openwrt.org> | 2013-01-08 22:19:31 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2013-01-08 22:19:31 +0000 |
commit | 8dbed04ec9cad7771590af557b9edfe8e04bca8c (patch) | |
tree | 412beb5055a726a8f371c35580bdc85300e4e2f7 /target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch | |
parent | c38cb63808ff1a395dd0384af23773b044adf9cb (diff) | |
download | upstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.tar.gz upstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.tar.bz2 upstream-8dbed04ec9cad7771590af557b9edfe8e04bca8c.zip |
kernel: add support for 3.8-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org>
SVN-Revision: 35055
Diffstat (limited to 'target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..f1783d0de3 --- /dev/null +++ b/target/linux/generic/patches-3.8/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 +@@ -647,6 +647,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; + } |