From 3e6e12295cb214c967095c990cc25bd00d06549e Mon Sep 17 00:00:00 2001 From: hcg Date: Thu, 25 Aug 2011 10:37:30 +0000 Subject: [PATCH] [omap35xx]: Re-order patches, add nand sub-page alignment git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28084 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- ...patch => 001-change_partition_table.patch} | 0 ...ix-twl-rtc.patch => 002-fix_twl_rtc.patch} | 0 .../patches-3.0/003-nand_subpage_align.patch | 22 +++++++++++++++++++ 3 files changed, 22 insertions(+) rename target/linux/omap35xx/patches-3.0/{003-change_partition_table.patch => 001-change_partition_table.patch} (100%) rename target/linux/omap35xx/patches-3.0/{004-fix-twl-rtc.patch => 002-fix_twl_rtc.patch} (100%) create mode 100644 target/linux/omap35xx/patches-3.0/003-nand_subpage_align.patch 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 similarity index 100% rename from target/linux/omap35xx/patches-3.0/003-change_partition_table.patch rename to 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 similarity index 100% rename from target/linux/omap35xx/patches-3.0/004-fix-twl-rtc.patch rename to 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 000000000..4bb854db6 --- /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)