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

Commit a79cfde1 authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions

parents 9bfd143e 8c4340fc

arch/arm/boot/dts/armada-370-xp.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


/ {

	model = "Marvell Armada 370 and XP SoC";

	compatible = "marvell,armada_370_xp";

	compatible = "marvell,armada-370-xp";



	cpus {

		cpu@0 {

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

+4 −5
Original line number Diff line number Diff line
@@ -64,13 +64,12 @@ static void __init armada_370_xp_dt_init(void) 
	of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);

}



static const char * const armada_370_xp_dt_board_dt_compat[] = {

	"marvell,a370-db",

	"marvell,axp-db",

static const char * const armada_370_xp_dt_compat[] = {

	"marvell,armada-370-xp",

	NULL,

};



DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)")

DT_MACHINE_START(ARMADA_XP_DT, "Marvell Armada 370/XP (Device Tree)")

	.init_machine	= armada_370_xp_dt_init,

	.map_io		= armada_370_xp_map_io,

	.init_early	= armada_370_xp_init_early,
@@ -78,5 +77,5 @@ DT_MACHINE_START(ARMADA_XP_DT, "Marvell Aramada 370/XP (Device Tree)") 
	.handle_irq     = armada_370_xp_handle_irq,

	.timer		= &armada_370_xp_timer,

	.restart	= mvebu_restart,

	.dt_compat	= armada_370_xp_dt_board_dt_compat,

	.dt_compat	= armada_370_xp_dt_compat,

MACHINE_END