aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/cm-x300.c
diff options
context:
space:
mode:
authorIgor Grinberg <grinberg@compulab.co.il>2010-03-09 04:43:52 -0500
committerEric Miao <eric.y.miao@gmail.com>2010-05-11 11:25:02 -0400
commit818809752303b5b792dde4ace6321e8ccc180f65 (patch)
tree7fce878131b7f316ba9996516380ca4b49fb8c4c /arch/arm/mach-pxa/cm-x300.c
parentd176d64b54c72ee00f825dddd63830f8bd2b5155 (diff)
[ARM] pxa/cm-x300: update the memory fixup.
CM-X300 bootloader passes DRAM configuration information in ATAGS, however, the first memory bank is reported at actual physical address 0x8000000. Use the configuration information supplied by the bootloader and cope with the necessity to have PHYS_ADDR=0xa0000000. Signed-off-by: Igor Grinberg <grinberg@compulab.co.il> Signed-off-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/mach-pxa/cm-x300.c')
-rw-r--r--arch/arm/mach-pxa/cm-x300.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 2012588fb200..be9dc7a20fbd 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -767,13 +767,13 @@ static void __init cm_x300_init(void)
767static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags, 767static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags,
768 char **cmdline, struct meminfo *mi) 768 char **cmdline, struct meminfo *mi)
769{ 769{
770 mi->nr_banks = 2; 770 /* Make sure that mi->bank[0].start = PHYS_ADDR */
771 mi->bank[0].start = 0xa0000000; 771 for (; tags->hdr.size; tags = tag_next(tags))
772 mi->bank[0].node = 0; 772 if (tags->hdr.tag == ATAG_MEM &&
773 mi->bank[0].size = (64*1024*1024); 773 tags->u.mem.start == 0x80000000) {
774 mi->bank[1].start = 0xc0000000; 774 tags->u.mem.start = 0xa0000000;
775 mi->bank[1].node = 0; 775 break;
776 mi->bank[1].size = (64*1024*1024); 776 }
777} 777}
778 778
779MACHINE_START(CM_X300, "CM-X300 module") 779MACHINE_START(CM_X300, "CM-X300 module")