diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-28 10:27:59 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-29 19:49:04 -0400 |
commit | d458773fb3c456d0e2e860fece8602b062e2f7a0 (patch) | |
tree | a5959969987114e435d3bb3216f2525fb38518cf /arch | |
parent | de7e75326c05c10ebd96aed9440c870f0ff1e34f (diff) |
ARM: l2c: bcm_5301x: convert to generic l2c OF initialisation
Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead. We can remove the explicit machine init too
as this becomes identical to the generic version.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-bcm/bcm_5301x.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c index 6bc9c31b1b0b..e9bcbdbce555 100644 --- a/arch/arm/mach-bcm/bcm_5301x.c +++ b/arch/arm/mach-bcm/bcm_5301x.c | |||
@@ -43,19 +43,14 @@ static void __init bcm5301x_init_early(void) | |||
43 | "imprecise external abort"); | 43 | "imprecise external abort"); |
44 | } | 44 | } |
45 | 45 | ||
46 | static void __init bcm5301x_dt_init(void) | ||
47 | { | ||
48 | l2x0_of_init(0, ~0); | ||
49 | of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); | ||
50 | } | ||
51 | |||
52 | static const char __initconst *bcm5301x_dt_compat[] = { | 46 | static const char __initconst *bcm5301x_dt_compat[] = { |
53 | "brcm,bcm4708", | 47 | "brcm,bcm4708", |
54 | NULL, | 48 | NULL, |
55 | }; | 49 | }; |
56 | 50 | ||
57 | DT_MACHINE_START(BCM5301X, "BCM5301X") | 51 | DT_MACHINE_START(BCM5301X, "BCM5301X") |
52 | .l2c_aux_val = 0, | ||
53 | .l2c_aux_mask = ~0, | ||
58 | .init_early = bcm5301x_init_early, | 54 | .init_early = bcm5301x_init_early, |
59 | .init_machine = bcm5301x_dt_init, | ||
60 | .dt_compat = bcm5301x_dt_compat, | 55 | .dt_compat = bcm5301x_dt_compat, |
61 | MACHINE_END | 56 | MACHINE_END |