Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e9c06fb authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Jason Cooper
Browse files

ARM: Kirkwood: fix disabling CACHE_FEROCEON_L2 



Move the CACHE_FEROCEON_L2 test to kirkwood_l2_init, since linking
fails on the reference to feroceon_l2_init.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent ddffeb8c

arch/arm/mach-kirkwood/board-dt.c

+0 −2
Original line number Diff line number Diff line
@@ -51,9 +51,7 @@ static void __init kirkwood_dt_init(void) 


	kirkwood_setup_cpu_mbus();



#ifdef CONFIG_CACHE_FEROCEON_L2

	kirkwood_l2_init();

#endif



	/* Setup root of clk tree */

	kirkwood_clk_init();

arch/arm/mach-kirkwood/common.c

+2 −2
Original line number Diff line number Diff line
@@ -633,6 +633,7 @@ char * __init kirkwood_id(void) 


void __init kirkwood_l2_init(void)

{

#ifdef CONFIG_CACHE_FEROCEON_L2

#ifdef CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH

	writel(readl(L2_CONFIG_REG) | L2_WRITETHROUGH, L2_CONFIG_REG);

	feroceon_l2_init(1);
@@ -640,6 +641,7 @@ void __init kirkwood_l2_init(void) 
	writel(readl(L2_CONFIG_REG) & ~L2_WRITETHROUGH, L2_CONFIG_REG);

	feroceon_l2_init(0);

#endif

#endif

}



void __init kirkwood_init(void)
@@ -657,9 +659,7 @@ void __init kirkwood_init(void) 


	kirkwood_setup_cpu_mbus();



#ifdef CONFIG_CACHE_FEROCEON_L2

	kirkwood_l2_init();

#endif



	/* Setup root of clk tree */

	kirkwood_clk_init();