Commit e33369cb authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

ARM: mvebu: move L2 cache initialization in init_early() 



In preparation for moving the IRQ controller driver to
drivers/irqchip/, we don't want the IRQ controller driver to be
responsible for initializing the L2 cache. Instead, let's initialize
the L2 cache at the init_early() level, like mach-exynos/common.c is
doing.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: default avatarEzequiel Garcia <ezequiel.garcia@free-electrons.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 31880c37

arch/arm/mach-mvebu/armada-370-xp.c

+5 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/time-armada-370-xp.h>

#include <linux/clk/mvebu.h>

#include <linux/dma-mapping.h>

#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/arch.h>

#include <asm/mach/map.h>

#include <asm/mach/time.h>
@@ -54,6 +55,10 @@ void __init armada_370_xp_init_early(void) 
	 * to make sure such the allocations won't fail.

	 */

	init_dma_coherent_pool_size(SZ_1M);



#ifdef CONFIG_CACHE_L2X0

	l2x0_of_init(0, ~0UL);

#endif

}



static void __init armada_370_xp_dt_init(void)

arch/arm/mach-mvebu/irq-armada-370-xp.c

+0 −4
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <asm/mach/arch.h>

#include <asm/exception.h>

#include <asm/smp_plat.h>

#include <asm/hardware/cache-l2x0.h>



/* Interrupt Controller Registers Map */

#define ARMADA_370_XP_INT_SET_MASK_OFFS		(0x48)
@@ -292,7 +291,4 @@ static const struct of_device_id mpic_of_match[] __initconst = { 
void __init armada_370_xp_init_irq(void)

{

	of_irq_init(mpic_of_match);

#ifdef CONFIG_CACHE_L2X0

	l2x0_of_init(0, ~0UL);

#endif

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE