From: linux@arm.linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/11] ARM: integrator: use new init_early for clock tree init
Date: Thu, 27 Jan 2011 13:46:05 +0000 [thread overview]
Message-ID: <E1PiSAn-0003ot-Uc@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20110127134532.GE25968@n2100.arm.linux.org.uk>
Initialize the clock tree early.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
arch/arm/mach-integrator/common.h | 1 +
arch/arm/mach-integrator/core.c | 7 +++++--
arch/arm/mach-integrator/integrator_ap.c | 3 ++-
arch/arm/mach-integrator/integrator_cp.c | 11 +++++++++--
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-integrator/common.h b/arch/arm/mach-integrator/common.h
index 5f96e15..a08f9b0 100644
--- a/arch/arm/mach-integrator/common.h
+++ b/arch/arm/mach-integrator/common.h
@@ -1 +1,2 @@
+void integrator_init_early(void);
void integrator_reserve(void);
diff --git a/arch/arm/mach-integrator/core.c b/arch/arm/mach-integrator/core.c
index b8e884b..77315b9 100644
--- a/arch/arm/mach-integrator/core.c
+++ b/arch/arm/mach-integrator/core.c
@@ -144,12 +144,15 @@ static struct clk_lookup lookups[] = {
}
};
+void __init integrator_init_early(void)
+{
+ clkdev_add_table(lookups, ARRAY_SIZE(lookups));
+}
+
static int __init integrator_init(void)
{
int i;
- clkdev_add_table(lookups, ARRAY_SIZE(lookups));
-
for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
struct amba_device *d = amba_devs[i];
amba_device_register(d, &iomem_resource);
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c
index b666443..4f06b5d 100644
--- a/arch/arm/mach-integrator/integrator_ap.c
+++ b/arch/arm/mach-integrator/integrator_ap.c
@@ -499,8 +499,9 @@ static struct sys_timer ap_timer = {
MACHINE_START(INTEGRATOR, "ARM-Integrator")
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.boot_params = 0x00000100,
- .map_io = ap_map_io,
.reserve = integrator_reserve,
+ .map_io = ap_map_io,
+ .init_early = integrator_init_early,
.init_irq = ap_init_irq,
.timer = &ap_timer,
.init_machine = ap_init,
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c
index 9c02037..e6700aa 100644
--- a/arch/arm/mach-integrator/integrator_cp.c
+++ b/arch/arm/mach-integrator/integrator_cp.c
@@ -520,11 +520,17 @@ static struct amba_device *amba_devs[] __initdata = {
&clcd_device,
};
+static void __init intcp_init_early(void)
+{
+ clkdev_add_table(cp_lookups, ARRAY_SIZE(cp_lookups));
+
+ integrator_init_early();
+}
+
static void __init intcp_init(void)
{
int i;
- clkdev_add_table(cp_lookups, ARRAY_SIZE(cp_lookups));
platform_add_devices(intcp_devs, ARRAY_SIZE(intcp_devs));
for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
@@ -554,8 +560,9 @@ static struct sys_timer cp_timer = {
MACHINE_START(CINTEGRATOR, "ARM-IntegratorCP")
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.boot_params = 0x00000100,
- .map_io = intcp_map_io,
.reserve = integrator_reserve,
+ .map_io = intcp_map_io,
+ .init_early = intcp_init_early,
.init_irq = intcp_init_irq,
.timer = &cp_timer,
.init_machine = intcp_init,
--
1.6.2.5
next prev parent reply other threads:[~2011-01-27 13:46 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-01-27 13:45 [PATCH 00/11] Rationalize and consolidate ARMs evaluation boards Russell King - ARM Linux
2011-01-27 13:46 ` Russell King - ARM Linux [this message]
2011-02-04 19:27 ` [PATCH 01/11] ARM: integrator: use new init_early for clock tree init Rob Herring
2011-02-04 19:31 ` Grant Likely
2011-02-04 19:34 ` Russell King - ARM Linux
2011-02-04 19:53 ` Rob Herring
2011-02-04 19:59 ` Russell King - ARM Linux
2011-01-27 13:46 ` [PATCH 02/11] ARM: versatile: use new init_early for clock tree and sched_clock init Russell King - ARM Linux
2011-01-27 13:46 ` [PATCH 03/11] ARM: realview: " Russell King - ARM Linux
2011-01-27 13:47 ` [PATCH 04/11] ARM: vexpress: " Russell King - ARM Linux
2011-01-27 13:47 ` [PATCH 05/11] ARM: versatile: remove old AMBA device DMA definitions Russell King - ARM Linux
2011-01-27 13:47 ` [PATCH 06/11] ARM: realview: " Russell King - ARM Linux
2011-01-27 14:40 ` Linus Walleij
2011-01-27 13:48 ` [PATCH 07/11] ARM: rationalize versatile family Kconfig/Makefile Russell King - ARM Linux
2011-01-27 13:48 ` [PATCH 08/11] ARM: integrator/versatile: consolidate FPGA IRQ handling code Russell King - ARM Linux
2011-01-27 13:48 ` [PATCH 09/11] ARM: realview/vexpress: consolidate localtimer support Russell King - ARM Linux
2011-01-27 13:49 ` [PATCH 10/11] ARM: realview/vexpress: consolidate SMP bringup code Russell King - ARM Linux
2011-01-27 13:49 ` [PATCH 11/11] ARM: integrator: add Integrator/CP sched_clock support Russell King - ARM Linux
2011-02-18 11:34 ` [PATCH 00/11] Rationalize and consolidate ARMs evaluation boards Catalin Marinas
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=E1PiSAn-0003ot-Uc@rmk-PC.arm.linux.org.uk \
--to=linux@arm.linux.org.uk \
--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).