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

Commit a048711c authored by Russell King's avatar Russell King
Browse files

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



Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead.  We can remove the explicit machine init too
as this becomes identical to the generic version.

Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d458773f

arch/arm/mach-berlin/berlin.c

+6 −11
Original line number Diff line number Diff line
@@ -18,16 +18,6 @@ 
#include <asm/hardware/cache-l2x0.h>

#include <asm/mach/arch.h>



static void __init berlin_init_machine(void)

{

	/*

	 * with DT probing for L2CCs, berlin_init_machine can be removed.

	 * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc

	 */

	l2x0_of_init(0x30c00000, 0xfeffffff);

	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char * const berlin_dt_compat[] = {

	"marvell,berlin",

	NULL,
@@ -35,5 +25,10 @@ static const char * const berlin_dt_compat[] = { 


DT_MACHINE_START(BERLIN_DT, "Marvell Berlin")

	.dt_compat	= berlin_dt_compat,

	.init_machine	= berlin_init_machine,

	/*

	 * with DT probing for L2CCs, berlin_init_machine can be removed.

	 * Note: 88DE3005 (Armada 1500-mini) uses pl310 l2cc

	 */

	.l2c_aux_val	= 0x30c00000,

	.l2c_aux_mask	= 0xfeffffff,

MACHINE_END