summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean MacLennan <smaclennan@pikatech.com>2008-07-09 05:00:10 +1000
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2008-07-09 13:36:39 -0400
commit4248652d4f3ce6be1a94c77ddbfeb937af1df800 (patch)
tree74a9f94d67ab5bce55630ab9c8b401649eeac4a1
parent1bc54c03117b90716e0dedd7abb2a20405de65df (diff)
downloadlinux-4248652d4f3ce6be1a94c77ddbfeb937af1df800.tar.gz
linux-4248652d4f3ce6be1a94c77ddbfeb937af1df800.tar.bz2
linux-4248652d4f3ce6be1a94c77ddbfeb937af1df800.zip
powerpc/44x: Support NAND boot for Rev A Warp boards
Allow the Rev A Warp boards to boot from NAND. Signed-off-by: Sean MacLennan <smaclennan@pikatech.com> Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>
-rw-r--r--arch/powerpc/platforms/44x/warp-nand.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
index 7bec2815771a..e55746b824b4 100644
--- a/arch/powerpc/platforms/44x/warp-nand.c
+++ b/arch/powerpc/platforms/44x/warp-nand.c
@@ -113,9 +113,14 @@ static int warp_setup_nand_flash(void)
pp = of_find_property(np, "reg", NULL);
if (pp && (pp->length == 12)) {
u32 *v = pp->value;
- if (v[2] == 0x4000000)
+ if (v[2] == 0x4000000) {
/* Rev A = 64M NAND */
- warp_nand_chip0.nr_partitions = 2;
+ warp_nand_chip0.nr_partitions = 3;
+
+ nand_parts[1].size = 0x3000000;
+ nand_parts[2].offset = 0x3200000;
+ nand_parts[2].size = 0x0e00000;
+ }
}
of_node_put(np);
}