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

Commit 8523f615 authored by Russell King's avatar Russell King
Browse files

ARM: l2c: nomadik: convert to generic l2c OF initialisation 



Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead.  This also allows us to eliminate the
.init_machine function as it is identical to the generic version.

Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 42708e37

arch/arm/mach-nomadik/cpu-8815.c

+3 −10
Original line number Diff line number Diff line
@@ -143,23 +143,16 @@ static int __init cpu8815_mmcsd_init(void) 
}

device_initcall(cpu8815_mmcsd_init);



static void __init cpu8815_init_of(void)

{

#ifdef CONFIG_CACHE_L2X0

	/* At full speed latency must be >=2, so 0x249 in low bits */

	l2x0_of_init(0x00700249, 0xfe0fefff);

#endif

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char * cpu8815_board_compat[] = {

	"calaosystems,usb-s8815",

	NULL,

};



DT_MACHINE_START(NOMADIK_DT, "Nomadik STn8815")

	/* At full speed latency must be >=2, so 0x249 in low bits */

	.l2c_aux_val	= 0x00700249,

	.l2c_aux_mask	= 0xfe0fefff,

	.map_io		= cpu8815_map_io,

	.init_machine	= cpu8815_init_of,

	.restart	= cpu8815_restart,

	.dt_compat      = cpu8815_board_compat,

MACHINE_END