diff options
| author | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-02 17:00:07 +0100 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-01-02 17:00:07 +0100 |
| commit | c498cc5981b1cc3c9a2c224dea688ca0995f9780 (patch) | |
| tree | ff86489687439880c59e4e7979dc2914ea9e0a5e /recipes/linux | |
| parent | b028448b8add42f9bfdb87e71ec1c2679f5c4646 (diff) | |
| parent | 3a3cfc7e061bca6e83850e52082aaf6c26e1a2e2 (diff) | |
Merge branch 'org.openembedded.dev' of git.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'recipes/linux')
| -rw-r--r-- | recipes/linux/linux-omap-2.6.32/0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch | 35 | ||||
| -rw-r--r-- | recipes/linux/linux-omap_2.6.32.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/recipes/linux/linux-omap-2.6.32/0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch b/recipes/linux/linux-omap-2.6.32/0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch new file mode 100644 index 0000000000..6e7f706c51 --- /dev/null +++ b/recipes/linux/linux-omap-2.6.32/0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch @@ -0,0 +1,35 @@ +From 64e4fc11b960da97728e0d87dcf4c1e98f808501 Mon Sep 17 00:00:00 2001 +From: Steve Sakoman <steve@sakoman.com> +Date: Thu, 31 Dec 2009 07:05:02 -0800 +Subject: [PATCH] MTD: NAND: omap2: proper fix for subpage read ECC errors + +--- + drivers/mtd/nand/omap2.c | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/drivers/mtd/nand/omap2.c b/drivers/mtd/nand/omap2.c +index 1bb799f..75004fe 100644 +--- a/drivers/mtd/nand/omap2.c ++++ b/drivers/mtd/nand/omap2.c +@@ -295,11 +295,14 @@ static void omap_read_buf_pref(struct mtd_info *mtd, u_char *buf, int len) + u32 *p = (u32 *)buf; + + /* take care of subpage reads */ +- for (; len % 4 != 0; ) { +- *buf++ = __raw_readb(info->nand.IO_ADDR_R); +- len--; ++ if (len % 4) { ++ if (info->nand.options & NAND_BUSWIDTH_16) ++ omap_read_buf16(mtd, buf, len % 4); ++ else ++ omap_read_buf8(mtd, buf, len % 4); ++ p = (u32 *) (buf + len % 4); ++ len -= len % 4; + } +- p = (u32 *) buf; + + /* configure and start prefetch transfer */ + ret = gpmc_prefetch_enable(info->gpmc_cs, 0x0, len, 0x0); +-- +1.6.5 + diff --git a/recipes/linux/linux-omap_2.6.32.bb b/recipes/linux/linux-omap_2.6.32.bb index f8472b3a21..285c260c41 100644 --- a/recipes/linux/linux-omap_2.6.32.bb +++ b/recipes/linux/linux-omap_2.6.32.bb @@ -29,6 +29,7 @@ file://0004-drivers-input-touchscreen-ads7846-return-ENODEV.patch;patch=1 \ file://0005-ARM-OMAP-add-support-for-TCT-Zippy-to-Beagle-board.patch;patch=1 \ file://0006-ARM-OMAP-Make-beagle-u-boot-partition-writable.patch;patch=1 \ file://0007-ASoC-enable-audio-capture-by-default-for-twl4030.patch;patch=1 \ +file://0009-MTD-NAND-omap2-proper-fix-for-subpage-read-ECC-error.patch;patch=1 \ file://madc/0009-drivers-mfd-add-twl4030-madc-driver.patch;patch=1 \ file://madc/0010-ARM-OMAP-Add-twl4030-madc-support-to-Overo.patch;patch=1 \ file://madc/0011-ARM-OMAP-Add-twl4030-madc-support-to-Beagle.patch;patch=1 \ |