diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 11:54:57 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 11:54:57 +1000 |
| commit | 930074b6b9c4895d20cdadba5aff97907e28728d (patch) | |
| tree | 3725eca121188f2e9c3b8bb4d4b8ba35e92640c7 /arch/powerpc/platforms/44x/warp-nand.c | |
| parent | 3fd44736db9a5bf33e4a216b9cd43c9cfd57c459 (diff) | |
| parent | 2bf3016f89344d4cd8b2c96bbec2b642a2bde413 (diff) | |
Merge commit 'jwb/jwb-next'
Diffstat (limited to 'arch/powerpc/platforms/44x/warp-nand.c')
| -rw-r--r-- | arch/powerpc/platforms/44x/warp-nand.c | 9 |
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 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); } |