diff options
| author | Hamish Guthrie <hcg@openwrt.org> | 2011-08-25 10:37:30 +0000 |
|---|---|---|
| committer | Hamish Guthrie <hcg@openwrt.org> | 2011-08-25 10:37:30 +0000 |
| commit | 35525ed19edfdc348d94b03259357c5841b2ca7f (patch) | |
| tree | 9e28fa4b8d055118706ed3310de08b82f395fe63 | |
| parent | 31b92fe935309b1f110b0d9ff6c54506385d1927 (diff) | |
| download | upstream-35525ed19edfdc348d94b03259357c5841b2ca7f.tar.gz upstream-35525ed19edfdc348d94b03259357c5841b2ca7f.tar.bz2 upstream-35525ed19edfdc348d94b03259357c5841b2ca7f.zip | |
[omap35xx]: Re-order patches, add nand sub-page alignment
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28084 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/omap35xx/patches-3.0/001-change_partition_table.patch (renamed from target/linux/omap35xx/patches-3.0/003-change_partition_table.patch) | 0 | ||||
| -rw-r--r-- | target/linux/omap35xx/patches-3.0/002-fix_twl_rtc.patch (renamed from target/linux/omap35xx/patches-3.0/004-fix-twl-rtc.patch) | 0 | ||||
| -rw-r--r-- | target/linux/omap35xx/patches-3.0/003-nand_subpage_align.patch | 22 |
3 files changed, 22 insertions, 0 deletions
diff --git a/target/linux/omap35xx/patches-3.0/003-change_partition_table.patch b/target/linux/omap35xx/patches-3.0/001-change_partition_table.patch index 65ba45a358..65ba45a358 100644 --- a/target/linux/omap35xx/patches-3.0/003-change_partition_table.patch +++ b/target/linux/omap35xx/patches-3.0/001-change_partition_table.patch diff --git a/target/linux/omap35xx/patches-3.0/004-fix-twl-rtc.patch b/target/linux/omap35xx/patches-3.0/002-fix_twl_rtc.patch index ef243ea47a..ef243ea47a 100644 --- a/target/linux/omap35xx/patches-3.0/004-fix-twl-rtc.patch +++ b/target/linux/omap35xx/patches-3.0/002-fix_twl_rtc.patch diff --git a/target/linux/omap35xx/patches-3.0/003-nand_subpage_align.patch b/target/linux/omap35xx/patches-3.0/003-nand_subpage_align.patch new file mode 100644 index 0000000000..4bb854db6d --- /dev/null +++ b/target/linux/omap35xx/patches-3.0/003-nand_subpage_align.patch @@ -0,0 +1,22 @@ +diff -urN linux-2.6.38.old/drivers/mtd/nand/omap2.c linux-2.6.38/drivers/mtd/nand/omap2.c +--- linux-2.6.38.old/drivers/mtd/nand/omap2.c 2011-03-15 02:20:32.000000000 +0100 ++++ linux-2.6.38/drivers/mtd/nand/omap2.c 2011-03-21 15:05:21.000000000 +0100 +@@ -245,6 +245,18 @@ + int ret = 0; + u32 *p = (u32 *)buf; + ++ /* u32 align the buffer and read */ ++ /* NB: This assumes the buf ptr can be aligned *down* which is a valid. ++ * Assumption when dealing with ecc buffers etc. ++ */ ++ u32 addr = (u32)p; ++ ++ int diff = addr & 3; ++ addr -= diff; ++ len += diff; ++ len = (len + 3) & ~3; ++ p = (u32 *)addr; ++ + /* take care of subpage reads */ + if (len % 4) { + if (info->nand.options & NAND_BUSWIDTH_16) |