From: shc_work@mail.ru (Alexander Shiyan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND 09/15] ARM: clps711x: Replace "arch_initcall" in common code with ".init_early"
Date: Wed, 5 Jun 2013 09:59:17 +0400 [thread overview]
Message-ID: <1370411967-29451-10-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1370411967-29451-1-git-send-email-shc_work@mail.ru>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/mach-clps711x/board-autcpu12.c | 1 +
arch/arm/mach-clps711x/board-cdb89712.c | 1 +
arch/arm/mach-clps711x/board-clep7312.c | 1 +
arch/arm/mach-clps711x/board-edb7211.c | 1 +
arch/arm/mach-clps711x/board-fortunet.c | 1 +
arch/arm/mach-clps711x/board-p720t.c | 1 +
arch/arm/mach-clps711x/common.c | 10 +++-------
arch/arm/mach-clps711x/common.h | 1 +
8 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c
index cd50314..5867aeb 100644
--- a/arch/arm/mach-clps711x/board-autcpu12.c
+++ b/arch/arm/mach-clps711x/board-autcpu12.c
@@ -271,6 +271,7 @@ MACHINE_START(AUTCPU12, "autronix autcpu12")
.atag_offset = 0x20000,
.nr_irqs = CLPS711X_NR_IRQS,
.map_io = clps711x_map_io,
+ .init_early = clps711x_init_early,
.init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init,
.init_machine = autcpu12_init,
diff --git a/arch/arm/mach-clps711x/board-cdb89712.c b/arch/arm/mach-clps711x/board-cdb89712.c
index a80ae57..a9e38c6 100644
--- a/arch/arm/mach-clps711x/board-cdb89712.c
+++ b/arch/arm/mach-clps711x/board-cdb89712.c
@@ -141,6 +141,7 @@ MACHINE_START(CDB89712, "Cirrus-CDB89712")
.atag_offset = 0x100,
.nr_irqs = CLPS711X_NR_IRQS,
.map_io = clps711x_map_io,
+ .init_early = clps711x_init_early,
.init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init,
.init_machine = cdb89712_init,
diff --git a/arch/arm/mach-clps711x/board-clep7312.c b/arch/arm/mach-clps711x/board-clep7312.c
index 014aa3c..b476424 100644
--- a/arch/arm/mach-clps711x/board-clep7312.c
+++ b/arch/arm/mach-clps711x/board-clep7312.c
@@ -39,6 +39,7 @@ MACHINE_START(CLEP7212, "Cirrus Logic 7212/7312")
.nr_irqs = CLPS711X_NR_IRQS,
.fixup = fixup_clep7312,
.map_io = clps711x_map_io,
+ .init_early = clps711x_init_early,
.init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init,
.handle_irq = clps711x_handle_irq,
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
index 3ba4b9e..db804b4 100644
--- a/arch/arm/mach-clps711x/board-edb7211.c
+++ b/arch/arm/mach-clps711x/board-edb7211.c
@@ -182,6 +182,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
.fixup = fixup_edb7211,
.reserve = edb7211_reserve,
.map_io = edb7211_map_io,
+ .init_early = clps711x_init_early,
.init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init,
.init_machine = edb7211_init,
diff --git a/arch/arm/mach-clps711x/board-fortunet.c b/arch/arm/mach-clps711x/board-fortunet.c
index c5675ef..b1561e3 100644
--- a/arch/arm/mach-clps711x/board-fortunet.c
+++ b/arch/arm/mach-clps711x/board-fortunet.c
@@ -77,6 +77,7 @@ MACHINE_START(FORTUNET, "ARM-FortuNet")
.nr_irqs = CLPS711X_NR_IRQS,
.fixup = fortunet_fixup,
.map_io = clps711x_map_io,
+ .init_early = clps711x_init_early,
.init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init,
.handle_irq = clps711x_handle_irq,
diff --git a/arch/arm/mach-clps711x/board-p720t.c b/arch/arm/mach-clps711x/board-p720t.c
index 601ef38..dd81b06 100644
--- a/arch/arm/mach-clps711x/board-p720t.c
+++ b/arch/arm/mach-clps711x/board-p720t.c
@@ -366,6 +366,7 @@ MACHINE_START(P720T, "ARM-Prospector720T")
.nr_irqs = CLPS711X_NR_IRQS,
.fixup = fixup_p720t,
.map_io = clps711x_map_io,
+ .init_early = clps711x_init_early,
.init_irq = clps711x_init_irq,
.init_time = clps711x_timer_init,
.init_machine = p720t_init,
diff --git a/arch/arm/mach-clps711x/common.c b/arch/arm/mach-clps711x/common.c
index f42302e..768d41c6 100644
--- a/arch/arm/mach-clps711x/common.c
+++ b/arch/arm/mach-clps711x/common.c
@@ -354,15 +354,11 @@ void clps711x_restart(char mode, const char *cmd)
static void clps711x_idle(void)
{
clps_writel(1, HALT);
- __asm__ __volatile__(
- "mov r0, r0\n\
- mov r0, r0");
+ asm("mov r0, r0");
+ asm("mov r0, r0");
}
-static int __init clps711x_idle_init(void)
+void __init clps711x_init_early(void)
{
arm_pm_idle = clps711x_idle;
- return 0;
}
-
-arch_initcall(clps711x_idle_init);
diff --git a/arch/arm/mach-clps711x/common.h b/arch/arm/mach-clps711x/common.h
index f84a729..2a22f4c 100644
--- a/arch/arm/mach-clps711x/common.h
+++ b/arch/arm/mach-clps711x/common.h
@@ -13,3 +13,4 @@ extern void clps711x_init_irq(void);
extern void clps711x_timer_init(void);
extern void clps711x_handle_irq(struct pt_regs *regs);
extern void clps711x_restart(char mode, const char *cmd);
+extern void clps711x_init_early(void);
--
1.8.1.5
next prev parent reply other threads:[~2013-06-05 5:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-05 5:59 [PATCH RESEND 01/15] ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND v2 2/3] ARM: clps711x: Re-add GPIO support Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 02/15] ARM: clps711x: Set PLL clock to zero if we work from 13 mHz source Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 03/15] ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 04/15] ARM: clps711x: autcpu12: Add support for NOR flash Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 05/15] ARM: clps711x: autcpu12: Special driver for handling memory is removed Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 06/15] ARM: clps711x: autcpu12: Move remaining specific definitions to board file Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 07/15] ARM: clps711x: p720t: Define PLD registers as GPIOs Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 08/15] ARM: clps711x: Move specific definitions from hardware.h to boards files Alexander Shiyan
2013-06-05 5:59 ` Alexander Shiyan [this message]
2013-06-05 5:59 ` [PATCH RESEND 10/15] ARM: clps711x: Add clocksource framework Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 11/15] ARM: clps711x: Optimize interrupt handling Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 12/15] ARM: clps711x: edb7211: Add support for I2C Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 13/15] ARM: clps711x: edb7211: Control LCD backlight via PWM Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 14/15] ARM: clps711x: Add support for SYSCON driver Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 15/15] ARM: clps711x: Update defconfig Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND v2 1/3] GPIO: clps711x: Rewrite driver for using generic GPIO code Alexander Shiyan
2013-06-17 6:24 ` Linus Walleij
2013-06-17 6:29 ` Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND v2 2/3] ARM: clps711x: Re-add GPIO support Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND v2 3/3] GPIO: clps711x: Add DT support Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 07/15] ARM: clps711x: p720t: Define PLD registers as GPIOs Alexander Shiyan
2013-06-19 16:18 ` [PATCH RESEND 01/15] ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency Arnd Bergmann
2013-06-19 16:25 ` Re[2]: " Alexander Shiyan
2013-06-19 17:59 ` Arnd Bergmann
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=1370411967-29451-10-git-send-email-shc_work@mail.ru \
--to=shc_work@mail.ru \
--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).