ARM: shmobile: Remove unused EMEV2/KZM9D early console
authorMagnus Damm <damm@opensource.se>
Tue, 2 Jul 2013 09:27:33 +0000 (18:27 +0900)
committerSimon Horman <horms+renesas@verge.net.au>
Wed, 17 Jul 2013 01:02:28 +0000 (10:02 +0900)
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>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/board-kzm9d.c
arch/arm/mach-shmobile/include/mach/emev2.h
arch/arm/mach-shmobile/setup-emev2.c

index 4368000e1127a4e33569a49f36f26e18fd773ee3..15900f1f8af74e54a1ee0b76681374ee4be7c598 100644 (file)
@@ -85,7 +85,7 @@ static const char *kzm9d_boards_compat_dt[] __initdata = {
 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,
index ac3751705cabc3634e3d452ff9df4140fdfc7b78..3e0c0441c782126f35623874bbf247924cfb6257 100644 (file)
@@ -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);
index b0564ce116e5d0f537f56d8e2ee8121f68916bcc..f6edd190a6b483d566128f0594717812538d7603 100644 (file)
@@ -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(void)
 {
        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;