diff options
Diffstat (limited to 'arch/arm/mach-sti/board-dt.c')
-rw-r--r-- | arch/arm/mach-sti/board-dt.c | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/arch/arm/mach-sti/board-dt.c b/arch/arm/mach-sti/board-dt.c index df731f2322fa..3cf6ef8d4317 100644 --- a/arch/arm/mach-sti/board-dt.c +++ b/arch/arm/mach-sti/board-dt.c | |||
@@ -14,25 +14,6 @@ | |||
14 | 14 | ||
15 | #include "smp.h" | 15 | #include "smp.h" |
16 | 16 | ||
17 | void __init stih41x_l2x0_init(void) | ||
18 | { | ||
19 | u32 way_size = 0x4; | ||
20 | u32 aux_ctrl; | ||
21 | /* may be this can be encoded in macros like BIT*() */ | ||
22 | aux_ctrl = (0x1 << L2X0_AUX_CTRL_SHARE_OVERRIDE_SHIFT) | | ||
23 | (0x1 << L2X0_AUX_CTRL_DATA_PREFETCH_SHIFT) | | ||
24 | (0x1 << L2X0_AUX_CTRL_INSTR_PREFETCH_SHIFT) | | ||
25 | (way_size << L2X0_AUX_CTRL_WAY_SIZE_SHIFT); | ||
26 | |||
27 | l2x0_of_init(aux_ctrl, L2X0_AUX_CTRL_MASK); | ||
28 | } | ||
29 | |||
30 | static void __init stih41x_machine_init(void) | ||
31 | { | ||
32 | stih41x_l2x0_init(); | ||
33 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | ||
34 | } | ||
35 | |||
36 | static const char *stih41x_dt_match[] __initdata = { | 17 | static const char *stih41x_dt_match[] __initdata = { |
37 | "st,stih415", | 18 | "st,stih415", |
38 | "st,stih416", | 19 | "st,stih416", |
@@ -41,7 +22,11 @@ static const char *stih41x_dt_match[] __initdata = { | |||
41 | }; | 22 | }; |
42 | 23 | ||
43 | DT_MACHINE_START(STM, "STiH415/416 SoC with Flattened Device Tree") | 24 | DT_MACHINE_START(STM, "STiH415/416 SoC with Flattened Device Tree") |
44 | .init_machine = stih41x_machine_init, | ||
45 | .smp = smp_ops(sti_smp_ops), | ||
46 | .dt_compat = stih41x_dt_match, | 25 | .dt_compat = stih41x_dt_match, |
26 | .l2c_aux_val = L2C_AUX_CTRL_SHARED_OVERRIDE | | ||
27 | L310_AUX_CTRL_DATA_PREFETCH | | ||
28 | L310_AUX_CTRL_INSTR_PREFETCH | | ||
29 | L2C_AUX_CTRL_WAY_SIZE(4), | ||
30 | .l2c_aux_mask = 0xc0000fff, | ||
31 | .smp = smp_ops(sti_smp_ops), | ||
47 | MACHINE_END | 32 | MACHINE_END |