Commit 02d7d6d2 authored by Alexander Shiyan's avatar Alexander Shiyan Committed by Arnd Bergmann

ARM: clps711x/p720t: Replace __initcall by .init_early call

Since we are trying to do to support multiple machines in a single kernel,
we need to eliminate the use of __initcall to be used for all machines.
Using .init_early call solves this problem.
Signed-off-by: default avatarAlexander Shiyan <shc_work@mail.ru>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent bd0a521e
...@@ -86,17 +86,7 @@ static void __init p720t_map_io(void) ...@@ -86,17 +86,7 @@ static void __init p720t_map_io(void)
iotable_init(p720t_io_desc, ARRAY_SIZE(p720t_io_desc)); iotable_init(p720t_io_desc, ARRAY_SIZE(p720t_io_desc));
} }
MACHINE_START(P720T, "ARM-Prospector720T") static void __init p720t_init_early(void)
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.atag_offset = 0x100,
.fixup = fixup_p720t,
.map_io = p720t_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END
static int p720t_hw_init(void)
{ {
/* /*
* Power down as much as possible in case we don't * Power down as much as possible in case we don't
...@@ -111,13 +101,19 @@ static int p720t_hw_init(void) ...@@ -111,13 +101,19 @@ static int p720t_hw_init(void)
PLD_CODEC = 0; PLD_CODEC = 0;
PLD_TCH = 0; PLD_TCH = 0;
PLD_SPI = 0; PLD_SPI = 0;
#ifndef CONFIG_DEBUG_LL if (!IS_ENABLED(CONFIG_DEBUG_LL)) {
PLD_COM2 = 0; PLD_COM2 = 0;
PLD_COM1 = 0; PLD_COM1 = 0;
#endif }
return 0;
} }
__initcall(p720t_hw_init); MACHINE_START(P720T, "ARM-Prospector720T")
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
.atag_offset = 0x100,
.fixup = fixup_p720t,
.init_early = p720t_init_early,
.map_io = p720t_map_io,
.init_irq = clps711x_init_irq,
.timer = &clps711x_timer,
.restart = clps711x_restart,
MACHINE_END
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment