From: grinberg@compulab.co.il (Igor Grinberg)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 5/5] [ARM] pxa/cm-x300: update the memory fixup.
Date: Tue, 9 Mar 2010 11:43:52 +0200 [thread overview]
Message-ID: <1268127832-20563-5-git-send-email-grinberg@compulab.co.il> (raw)
In-Reply-To: <1268127832-20563-4-git-send-email-grinberg@compulab.co.il>
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>
---
arch/arm/mach-pxa/cm-x300.c | 14 +++++++-------
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 2012588..be9dc7a 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)
static void __init cm_x300_fixup(struct machine_desc *mdesc, struct tag *tags,
char **cmdline, struct meminfo *mi)
{
- mi->nr_banks = 2;
- mi->bank[0].start = 0xa0000000;
- mi->bank[0].node = 0;
- mi->bank[0].size = (64*1024*1024);
- mi->bank[1].start = 0xc0000000;
- mi->bank[1].node = 0;
- mi->bank[1].size = (64*1024*1024);
+ /* Make sure that mi->bank[0].start = PHYS_ADDR */
+ for (; tags->hdr.size; tags = tag_next(tags))
+ if (tags->hdr.tag == ATAG_MEM &&
+ tags->u.mem.start == 0x80000000) {
+ tags->u.mem.start = 0xa0000000;
+ break;
+ }
}
MACHINE_START(CM_X300, "CM-X300 module")
--
1.6.4.4
next prev parent reply other threads:[~2010-03-09 9:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-09 9:43 [PATCH 1/5] [ARM] pxa/cm-x300.c: add battery charger support Igor Grinberg
2010-03-09 9:43 ` [PATCH 2/5] [ARM] pxa/cm-x300: da903x WLED is not connected on cm-x300 Igor Grinberg
2010-03-09 9:43 ` [PATCH 3/5] [ARM] pxa/cm-x300: fix da903x IRQ line assignment Igor Grinberg
2010-03-09 9:43 ` [PATCH 4/5] [ARM] pxa/cm-x300: add regulator on vcc_core Igor Grinberg
2010-03-09 9:43 ` Igor Grinberg [this message]
2010-03-14 9:29 ` [PATCH 1/5] [ARM] pxa/cm-x300.c: add battery charger support Igor Grinberg
2010-03-16 7:45 ` Eric Miao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1268127832-20563-5-git-send-email-grinberg@compulab.co.il \
--to=grinberg@compulab.co.il \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).