hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ARM: 7514/1: 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.

Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Linus Walleij 2012-09-06 09:06:52 +01:00 committed by Russell King
parent 55d512e245
commit 9bf26a1805
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-integrator/common.h
View File

@ -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 *);

6
arch/arm/mach-integrator/core.c
View File

@ -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:

2
arch/arm/mach-integrator/integrator_ap.c
View File

@ -312,6 +312,8 @@ static void __init ap_init(void)
lm_device_register(lmdev);
}
integrator_init(false);
}
/*

1
arch/arm/mach-integrator/integrator_cp.c
View File

@ -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)