diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-15 21:31:01 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-15 21:31:01 +0000 |
| commit | 235e3319876d5d1354e2774ec73495fdeb2616ec (patch) | |
| tree | d776ac5daed14d9e6ee5562e979d388420e8ff08 /target/linux/generic/patches-3.0/450-mtd_plat_nand_chip_fixup.patch | |
| parent | 0db9c2bd7d3620ba18fa784bda702d971783b4f6 (diff) | |
| download | upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.gz upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.bz2 upstream-235e3319876d5d1354e2774ec73495fdeb2616ec.zip | |
linux/generic: Add support for 3.0-rc3
Also make linux identify itself properly as 3.0, not 3.0.0.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
SVN-Revision: 27191
Diffstat (limited to 'target/linux/generic/patches-3.0/450-mtd_plat_nand_chip_fixup.patch')
| -rw-r--r-- | target/linux/generic/patches-3.0/450-mtd_plat_nand_chip_fixup.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/450-mtd_plat_nand_chip_fixup.patch b/target/linux/generic/patches-3.0/450-mtd_plat_nand_chip_fixup.patch new file mode 100644 index 0000000000..98b4c565ec --- /dev/null +++ b/target/linux/generic/patches-3.0/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 +@@ -625,6 +625,7 @@ struct platform_nand_chip { + int chip_delay; + unsigned int options; + const char **part_probe_types; ++ int (*chip_fixup)(struct mtd_info *mtd); + void (*set_parts)(uint64_t size, struct platform_nand_chip *chip); + void *priv; + }; +--- a/drivers/mtd/nand/plat_nand.c ++++ b/drivers/mtd/nand/plat_nand.c +@@ -94,7 +94,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; + } |