summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-04-28 15:43:12 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-05-30 00:50:25 +0100
commitb28dd4ac66de15c48b00184b63180094f2f7fb45 (patch)
tree0698f337d28abc86a2e453f70b8b4e32efd3db2f
parent060bf2af12e3a5cf6af95336f9aa66e2af6ffa43 (diff)
downloadtalos-obmc-linux-b28dd4ac66de15c48b00184b63180094f2f7fb45.tar.gz
talos-obmc-linux-b28dd4ac66de15c48b00184b63180094f2f7fb45.zip
ARM: l2c: vexpress: convert to generic l2c OF initialisation
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>
-rw-r--r--arch/arm/mach-vexpress/v2m.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
index 4f8b8cb17ff5..b2fea70d412d 100644
--- 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,
OpenPOWER on IntegriCloud