summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch
diff options
context:
space:
mode:
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-08 22:19:31 +0000
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-01-08 22:19:31 +0000
commitcb5bddeee233e4d33857b5dd46cf2bc906e7fd19 (patch)
treeeca211bce457b867f3e5fd2acded634db17c76cf /target/linux/generic/patches-3.8/450-mtd_plat_nand_chip_fixup.patch
parentc06bcf1ccd80e46f0e162047a716c7dc40dd8324 (diff)
kernel: add support for 3.8-rc2
Signed-off-by: Florian Fainelli <florian@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35055 3c298f89-4303-0410-b956-a3cf2f4a3e73
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.patch37
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 000000000..f1783d0de
--- /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;
+ }