ARM: integrator: call common init function from machine
Subsystems (2)
PATCH 1/6 ARM: integrator: call common init function from machine
There is currently a common integrator_init() function set up to be called from an arch_initcall(). The problem is that it is using machine_is_integrator() which is not working with device tree, let's call this from respective machine initilization function and add a parameter to tell whether it's the Integrator/AP or Integrator/CP instead.
There are still machine_is*() calls in the Integrator machines directory, but this one needs to be fixed lest we don't even get a UART console on the Integrator/AP after a Device Tree boot.
--- arch/arm/mach-integrator/common.h | 1 + arch/arm/mach-integrator/core.c | 6 ++---- arch/arm/mach-integrator/integrator_ap.c | 2 ++ arch/arm/mach-integrator/integrator_cp.c | 1 + 4 files changed, 6 insertions(+), 4 deletions(-)
arch/arm/mach-integrator/common.h +1 -0
@@ -1,3 +1,4 @@void integrator_init_early (void ); +int integrator_init (bool is_cp);void integrator_reserve (void );void integrator_restart (char ,const char *);
arch/arm/mach-integrator/core.c +2 -4
@@ -61,7 +61,7 @@ static struct amba_device *amba_devs[] __initdata = { &kmi1_device, }; -static int __init integrator_init (void ) +int __init integrator_init (bool is_cp) {int i;
@@ -70,7 +70,7 @@ static int __init integrator_init(void)* hard-code them. The Integator/CP and forward have proper cell IDs. * Else we leave them undefined to the bus driver can autoprobe them. */ -if (machine_is_integrator ()) { +if (!is_cp) { rtc_device.periphid =0x00041030 ; uart0_device.periphid =0x00041010 ; uart1_device.periphid =0x00041010 ;
@@ -86,8 +86,6 @@ static int __init integrator_init(void)return 0 ; } -arch_initcall (integrator_init); -/* * On the Integrator platform, the port RTS and DTR are provided by * bits in the following SC_CTRLS register bits:
arch/arm/mach-integrator/integrator_ap.c +2 -0
@@ -312,6 +312,8 @@ static void __init ap_init(void)lm_device_register (lmdev); } + +integrator_init (false); }/*
arch/arm/mach-integrator/integrator_cp.c +1 -0
@@ -366,6 +366,7 @@ static void __init intcp_init(void)struct amba_device *d = amba_devs[i];amba_device_register (d, &iomem_resource); } +integrator_init (true); }#define TIMER0_VA_BASE __io_address(INTEGRATOR_TIMER0_BASE)
Signature · 1 line
1.7.11.2
PATCH 1/6 ARM: integrator: call common init function from machine
Quoted 7 lines · Linus Walleij
There is currently a common
integrator_init()function set up to be called from anarch_initcall(). The problem is that it is usingmachine_is_integrator()which is not working with device tree, let's call this from respective machine initilization function and add a parameter to tell whether it's the Integrator/AP or Integrator/CP instead.
Quoted 6 lines
There are still machine_is*() calls in the Integrator machines directory, but this one needs to be fixed lest we don't even get a UART console on the Integrator/AP after a Device Tree boot.
Signed-off-by Linus Walleij <[email protected]>