leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: l2c: move l2c save function to __l2c_init()

Browse Source 
There's no reason this functionality should be specific to DT, so move
it into the common initialisation function.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2014-03-15 16:48:04 +00:00
parent 9846dfc98f
commit c40e7eb6c0
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mm/cache-l2x0.c
View File

@ -357,6 +357,13 @@ static void __init __l2c_init(const struct l2c_init_data *data,
int way_size_shift = L2X0_WAY_SIZE_SHIFT;
const char *type;
/*
* It is strange to save the register state before initialisation,
* but hey, this is what the DT implementations decided to do.
*/
if (data->save)
data->save(l2x0_base);
aux = readl_relaxed(l2x0_base + L2X0_AUX_CTRL);
aux &= aux_mask;
@ -1023,9 +1030,6 @@ int __init l2x0_of_init(u32 aux_val, u32 aux_mask)
aurora_broadcast_l2_commands();
}
if (data->save)
data->save(l2x0_base);
if (cache_id_part_number_from_dt)
cache_id = cache_id_part_number_from_dt;
else