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

Commit 510aca64 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Shawn Guo
Browse files

ARM: i.MX: Do not explicitly call l2x0_of_init() 



There's no need to explicitly call l2x0_of_init() since it will be
called as a part of init_IRQ() (see arch/arm/kernel/irq.c for
details). This way we can simplify imx_init_l2cache() and ditch the call
to it on i.MX35 (which does not claim compatibility with
"arm,pl310-cache") alltogether.

Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 1d9e9477

arch/arm/mach-imx/imx35-dt.c

+3 −7
Original line number Diff line number Diff line
@@ -20,20 +20,16 @@ 
#include "common.h"

#include "mx35.h"



static void __init imx35_irq_init(void)

{

	imx_init_l2cache();

	mx35_init_irq();

}



static const char * const imx35_dt_board_compat[] __initconst = {

	"fsl,imx35",

	NULL

};



DT_MACHINE_START(IMX35_DT, "Freescale i.MX35 (Device Tree Support)")

	.l2c_aux_val 	= 0,

	.l2c_aux_mask	= ~0,

	.map_io		= mx35_map_io,

	.init_early	= imx35_init_early,

	.init_irq	= imx35_irq_init,

	.init_irq	= mx35_init_irq,

	.dt_compat	= imx35_dt_board_compat,

MACHINE_END

arch/arm/mach-imx/mach-imx6q.c

+2 −0
Original line number Diff line number Diff line
@@ -407,6 +407,8 @@ static const char * const imx6q_dt_compat[] __initconst = { 
};



DT_MACHINE_START(IMX6Q, "Freescale i.MX6 Quad/DualLite (Device Tree)")

	.l2c_aux_val 	= 0,

	.l2c_aux_mask	= ~0,

	.smp		= smp_ops(imx_smp_ops),

	.map_io		= imx6q_map_io,

	.init_irq	= imx6q_init_irq,

arch/arm/mach-imx/mach-imx6sl.c

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ static const char * const imx6sl_dt_compat[] __initconst = { 
};



DT_MACHINE_START(IMX6SL, "Freescale i.MX6 SoloLite (Device Tree)")

	.l2c_aux_val 	= 0,

	.l2c_aux_mask	= ~0,

	.init_irq	= imx6sl_init_irq,

	.init_machine	= imx6sl_init_machine,

	.init_late      = imx6sl_init_late,

arch/arm/mach-imx/mach-imx6sx.c

+2 −0
Original line number Diff line number Diff line
@@ -103,6 +103,8 @@ static const char * const imx6sx_dt_compat[] __initconst = { 
};



DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)")

	.l2c_aux_val 	= 0,

	.l2c_aux_mask	= ~0,

	.init_irq	= imx6sx_init_irq,

	.init_machine	= imx6sx_init_machine,

	.dt_compat	= imx6sx_dt_compat,

arch/arm/mach-imx/system.c

+4 −8
Original line number Diff line number Diff line
@@ -98,13 +98,11 @@ void __init imx_init_l2cache(void) 


	np = of_find_compatible_node(NULL, NULL, "arm,pl310-cache");

	if (!np)

		goto out;

		return;



	l2x0_base = of_iomap(np, 0);

	if (!l2x0_base) {

		of_node_put(np);

		goto out;

	}

	if (!l2x0_base)

		goto put_node;



	if (!(readl_relaxed(l2x0_base + L2X0_CTRL) & L2X0_CTRL_EN)) {

		/* Configure the L2 PREFETCH and POWER registers */
@@ -121,9 +119,7 @@ void __init imx_init_l2cache(void) 
	}



	iounmap(l2x0_base);

put_node:

	of_node_put(np);



out:

	l2x0_of_init(0, ~0);

}

#endif