From ab145704b313a4b7e122a9eb3e1eeb00088ac3fe Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Fri, 6 Jun 2008 09:01:33 +0000 Subject: [PATCH] [kernel] add a chip_fixup function to the plat_nand driver git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11375 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../080-mtd_plat_nand_chip_fixup.patch | 32 +++++++++++++++++++ .../080-mtd_plat_nand_chip_fixup.patch | 32 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch create mode 100644 target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch diff --git a/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..ef885edac3 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.24/080-mtd_plat_nand_chip_fixup.patch @@ -0,0 +1,32 @@ +--- a/include/linux/mtd/nand.h ++++ b/include/linux/mtd/nand.h +@@ -573,6 +573,7 @@ + int chip_delay; + unsigned int options; + const char **part_probe_types; ++ int (*chip_fixup)(struct mtd_info *mtd); + void *priv; + }; + +--- a/drivers/mtd/nand/plat_nand.c ++++ b/drivers/mtd/nand/plat_nand.c +@@ -70,7 +70,18 @@ + platform_set_drvdata(pdev, data); + + /* Scan to find existance of the device */ +- if (nand_scan(&data->mtd, 1)) { ++ if (nand_scan_ident(&data->mtd, 1)) { ++ 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)) { + res = -ENXIO; + goto out; + } diff --git a/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch b/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..ef885edac3 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.25/080-mtd_plat_nand_chip_fixup.patch @@ -0,0 +1,32 @@ +--- a/include/linux/mtd/nand.h ++++ b/include/linux/mtd/nand.h +@@ -573,6 +573,7 @@ + int chip_delay; + unsigned int options; + const char **part_probe_types; ++ int (*chip_fixup)(struct mtd_info *mtd); + void *priv; + }; + +--- a/drivers/mtd/nand/plat_nand.c ++++ b/drivers/mtd/nand/plat_nand.c +@@ -70,7 +70,18 @@ + platform_set_drvdata(pdev, data); + + /* Scan to find existance of the device */ +- if (nand_scan(&data->mtd, 1)) { ++ if (nand_scan_ident(&data->mtd, 1)) { ++ 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)) { + res = -ENXIO; + goto out; + }