Merge tag 'pwm/for-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry...

[firefly-linux-kernel-4.4.55.git] / arch / arm / mach-bcm / bcm_5301x.c

diff --git a/arch/arm/mach-bcm/bcm_5301x.c b/arch/arm/mach-bcm/bcm_5301x.c
index edff69761e0463f774f158cb561780f87d3b94ff..e9bcbdbce55550e04e83a792d55b2eba65f94c32 100644 (file)
--- 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, ~0UL);
-       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