From: Sean MacLennan <smaclennan@pikatech.com>
Date: Tue, 8 Jul 2008 19:00:10 +0000 (+1000)
Subject: powerpc/44x: Support NAND boot for Rev A Warp boards
X-Git-Tag: v2.6.27-rc1~1058^2~14^2~2
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=4248652d4f3ce6be1a94c77ddbfeb937af1df800;p=~emulex%2Finfiniband.git

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>
---

diff --git a/arch/powerpc/platforms/44x/warp-nand.c b/arch/powerpc/platforms/44x/warp-nand.c
index 7bec2815771..e55746b824b 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);
 	}