All of lore.kernel.org
 help / color / mirror / Atom feed
From: will.deacon@arm.com (Will Deacon)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/6] ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU
Date: Wed, 30 Jan 2013 14:27:49 +0000	[thread overview]
Message-ID: <1359556069-28289-7-git-send-email-will.deacon@arm.com> (raw)
In-Reply-To: <1359556069-28289-1-git-send-email-will.deacon@arm.com>

When running on Integrator/AP using atags, ap_syscon_base is initialised
in ->map_io, which isn't called for !MMU platforms.

Instead, initialise the pointer in ->machine_init, as we do when booting
with device-tree.

Cc: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
 arch/arm/mach-integrator/integrator_ap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index 11e2a41..26762bf 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -613,7 +613,6 @@ static struct map_desc ap_io_desc_atag[] __initdata = {
 static void __init ap_map_io_atag(void)
 {
 	iotable_init(ap_io_desc_atag, ARRAY_SIZE(ap_io_desc_atag));
-	ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
 	ap_map_io();
 }
 
@@ -685,6 +684,7 @@ static void __init ap_init(void)
 
 	platform_device_register(&cfi_flash_device);
 
+	ap_syscon_base = __io_address(INTEGRATOR_SC_BASE);
 	sc_dec = readl(ap_syscon_base + INTEGRATOR_SC_DEC_OFFSET);
 	for (i = 0; i < 4; i++) {
 		struct lm_device *lmdev;
-- 
1.8.0

  parent reply	other threads:[~2013-01-30 14:27 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-30 14:27 [PATCH 0/6] Fix 740t support and remove more unused ARMv3 code Will Deacon
2013-01-30 14:27 ` [PATCH 1/6] ARM: tlbflush: remove ARMv3 support Will Deacon
2013-01-30 14:27 ` [PATCH 2/6] ARM: cache: remove ARMv3 support code Will Deacon
2013-01-31  0:40   ` Hyok S. Choi
2013-01-31  9:56     ` Will Deacon
2013-01-30 14:27 ` [PATCH 3/6] ARM: mm: fix numerous hideous errors in proc-arm740.S Will Deacon
2013-02-01 11:10   ` Hyok S. Choi
2013-01-30 14:27 ` [PATCH 4/6] ARM: mm: remove broken condition check for v4 flushing Will Deacon
2013-01-30 14:27 ` [PATCH 5/6] ARM: modules: don't export cpu_set_pte_ext when !MMU Will Deacon
2013-01-30 14:27 ` Will Deacon [this message]
2013-01-31 20:21   ` [PATCH 6/6] ARM: integrator: ensure ap_syscon_base is initialised when !CONFIG_MMU Linus Walleij
2013-01-31 22:34     ` Will Deacon
2013-01-31 22:56       ` Olof Johansson
2013-02-03 11:48         ` Will Deacon
2013-02-04 21:49           ` Arnd Bergmann
2013-02-06 18:25             ` Will Deacon
2013-02-10  0:29               ` Olof Johansson

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=1359556069-28289-7-git-send-email-will.deacon@arm.com \
    --to=will.deacon@arm.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.