From: magnus.damm@gmail.com (Magnus Damm)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 01/08] ARM: shmobile: Remove unused EMEV2/KZM9D early console
Date: Tue, 02 Jul 2013 18:27:33 +0900 [thread overview]
Message-ID: <20130702092733.32066.50335.sendpatchset@w520> (raw)
In-Reply-To: <20130702092725.32066.54861.sendpatchset@w520>
From: Magnus Damm <damm@opensource.se>
Remove EMEV2 early console code from KZM9D and instead
rely on console setup during regular platform device
probe time. This makes the DT code and the KZM9D board
support behave the same.
Signed-off-by: Magnus Damm <damm@opensource.se>
---
arch/arm/mach-shmobile/board-kzm9d.c | 2 +-
arch/arm/mach-shmobile/include/mach/emev2.h | 2 +-
arch/arm/mach-shmobile/setup-emev2.c | 24 +++---------------------
3 files changed, 5 insertions(+), 23 deletions(-)
--- 0001/arch/arm/mach-shmobile/board-kzm9d.c
+++ work/arch/arm/mach-shmobile/board-kzm9d.c 2013-07-01 20:07:13.000000000 +0900
@@ -85,7 +85,7 @@ static const char *kzm9d_boards_compat_d
DT_MACHINE_START(KZM9D_DT, "kzm9d")
.smp = smp_ops(emev2_smp_ops),
.map_io = emev2_map_io,
- .init_early = emev2_add_early_devices,
+ .init_early = emev2_init_delay,
.nr_irqs = NR_IRQS_LEGACY,
.init_irq = emev2_init_irq,
.init_machine = kzm9d_add_standard_devices,
--- 0001/arch/arm/mach-shmobile/include/mach/emev2.h
+++ work/arch/arm/mach-shmobile/include/mach/emev2.h 2013-07-01 20:06:35.000000000 +0900
@@ -3,7 +3,7 @@
extern void emev2_map_io(void);
extern void emev2_init_irq(void);
-extern void emev2_add_early_devices(void);
+extern void emev2_init_delay(void);
extern void emev2_add_standard_devices(void);
extern void emev2_clock_init(void);
extern void emev2_set_boot_vector(unsigned long value);
--- 0012/arch/arm/mach-shmobile/setup-emev2.c
+++ work/arch/arm/mach-shmobile/setup-emev2.c 2013-07-01 20:08:10.000000000 +0900
@@ -375,14 +375,11 @@ static struct platform_device pmu_device
.resource = pmu_resources,
};
-static struct platform_device *emev2_early_devices[] __initdata = {
+static struct platform_device *emev2_devices[] __initdata = {
&uart0_device,
&uart1_device,
&uart2_device,
&uart3_device,
-};
-
-static struct platform_device *emev2_late_devices[] __initdata = {
&sti_device,
&gio0_device,
&gio1_device,
@@ -396,29 +393,14 @@ void __init emev2_add_standard_devices(v
{
emev2_clock_init();
- platform_add_devices(emev2_early_devices,
- ARRAY_SIZE(emev2_early_devices));
-
- platform_add_devices(emev2_late_devices,
- ARRAY_SIZE(emev2_late_devices));
+ platform_add_devices(emev2_devices, ARRAY_SIZE(emev2_devices));
}
-static void __init emev2_init_delay(void)
+void __init emev2_init_delay(void)
{
shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
}
-void __init emev2_add_early_devices(void)
-{
- emev2_init_delay();
-
- early_platform_add_devices(emev2_early_devices,
- ARRAY_SIZE(emev2_early_devices));
-
- /* setup early console here as well */
- shmobile_setup_console();
-}
-
void __init emev2_init_irq(void)
{
void __iomem *gic_dist_base;
next prev parent reply other threads:[~2013-07-02 9:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-02 9:27 [PATCH 00/08] ARM: shmobile: EMEV2 and KZM9D update Magnus Damm
2013-07-02 9:27 ` Magnus Damm [this message]
2013-07-02 9:27 ` [PATCH 02/08] ARM: shmobile: Update KZM9D dts command line Magnus Damm
2013-07-02 9:27 ` [PATCH 03/08] ARM: shmobile: Make EMEV2 platform devices more compact Magnus Damm
2013-07-02 9:27 ` [PATCH 04/08] ARM: shmobile: Add GIO to EMEV2 dtsi Magnus Damm
2013-07-02 9:28 ` [PATCH 05/08] ARM: shmobile: Use DT for GIC on EMEV2 and KZM9D Magnus Damm
2013-07-02 9:28 ` [PATCH 06/08] ARM: shmobile: Use DT for SMP " Magnus Damm
2013-07-02 9:28 ` [PATCH 07/08] ARM: shmobile: EMEV2 map_io update Magnus Damm
2013-07-02 9:28 ` [PATCH 08/08] ARM: shmobile: Disconnect EMEV2 SMP code from clocks Magnus Damm
2013-07-03 12:29 ` [PATCH 00/08] ARM: shmobile: EMEV2 and KZM9D update Arnd Bergmann
2013-07-04 1:23 ` Simon Horman
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=20130702092733.32066.50335.sendpatchset@w520 \
--to=magnus.damm@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox