OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
060bf2a
)
ARM: l2c: vexpress: convert to generic l2c OF initialisation
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 28 Apr 2014 14:43:12 +0000
(15:43 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 29 May 2014 23:50:25 +0000
(
00:50
+0100)
Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mach-vexpress/v2m.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-vexpress/v2m.c
b/arch/arm/mach-vexpress/v2m.c
index
4f8b8cb
..
b2fea70
100644
(file)
--- a/
arch/arm/mach-vexpress/v2m.c
+++ b/
arch/arm/mach-vexpress/v2m.c
@@
-432,7
+432,6
@@
static const struct of_device_id v2m_dt_bus_match[] __initconst = {
static void __init v2m_dt_init(void)
{
- l2x0_of_init(0x00400000, 0xfe0fffff);
of_platform_populate(NULL, v2m_dt_bus_match, NULL, NULL);
}
@@
-443,6
+442,8
@@
static const char * const v2m_dt_match[] __initconst = {
DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
.dt_compat = v2m_dt_match,
+ .l2c_aux_val = 0x00400000,
+ .l2c_aux_mask = 0xfe0fffff,
.smp = smp_ops(vexpress_smp_ops),
.smp_init = smp_init_ops(vexpress_smp_init_ops),
.map_io = v2m_dt_map_io,