diff options
author | Jonas Gorski <jogo@openwrt.org> | 2012-02-02 08:23:54 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2012-02-02 08:23:54 +0000 |
commit | eca9950f63ec4491a7bd6138174ac08595184e1b (patch) | |
tree | a21d36b4e93a079ce234258a3a82b97dd82c10bf /target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch | |
parent | c336de3d85efb1a1150825870b7cbff4f7a65366 (diff) | |
download | upstream-eca9950f63ec4491a7bd6138174ac08595184e1b.tar.gz upstream-eca9950f63ec4491a7bd6138174ac08595184e1b.tar.bz2 upstream-eca9950f63ec4491a7bd6138174ac08595184e1b.zip |
kernel: add preliminary support for linux 3.3
Based on 3.3-rc2
SVN-Revision: 29986
Diffstat (limited to 'target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch')
-rw-r--r-- | target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.3/450-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..725877a9fe --- /dev/null +++ b/target/linux/generic/patches-3.3/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)) { ++ res = -ENXIO; ++ goto out; ++ } ++ ++ if (pdata->chip.chip_fixup) { ++ res = pdata->chip.chip_fixup(&data->mtd); ++ if (res) ++ goto out; ++ } ++ ++ if (nand_scan_tail(&data->mtd)) { + err = -ENXIO; + goto out; + } |