From: Russell King Date: Mon, 28 Apr 2014 14:27:59 +0000 (+0100) Subject: ARM: l2c: bcm_5301x: convert to generic l2c OF initialisation X-Git-Tag: firefly_0821_release~176^2~3820^2~13^2~1^3~45 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d458773fb3c456d0e2e860fece8602b062e2f7a0;p=firefly-linux-kernel-4.4.55.git 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 --- 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) "imprecise external abort"); } -static void __init bcm5301x_dt_init(void) -{ - l2x0_of_init(0, ~0); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - static const char __initconst *bcm5301x_dt_compat[] = { "brcm,bcm4708", NULL, }; DT_MACHINE_START(BCM5301X, "BCM5301X") + .l2c_aux_val = 0, + .l2c_aux_mask = ~0, .init_early = bcm5301x_init_early, - .init_machine = bcm5301x_dt_init, .dt_compat = bcm5301x_dt_compat, MACHINE_END