evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Thomas Petazzoni 2012-11-22 10:50:55 +01:00
commit a79cfde1b1
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/armada-370-xp.dtsi
View file

@ -20,7 +20,7 @@
/ { / {
model = "Marvell Armada 370 and XP SoC"; model = "Marvell Armada 370 and XP SoC";
compatible = "marvell,armada_370_xp"; compatible = "marvell,armada-370-xp";
cpus { cpus {
cpu@0 { cpu@0 {

9
arch/arm/mach-mvebu/armada-370-xp.c
View file

@ -64,13 +64,12 @@ static void __init armada_370_xp_dt_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
static const char * const armada_370_xp_dt_board_dt_compat[] = { static const char * const armada_370_xp_dt_compat[] = {
"marvell,a370-db", "marvell,armada-370-xp",
"marvell,axp-db",
NULL, 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, .init_machine = armada_370_xp_dt_init,
.map_io = armada_370_xp_map_io, .map_io = armada_370_xp_map_io,
.init_early = armada_370_xp_init_early, .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, .handle_irq = armada_370_xp_handle_irq,
.timer = &armada_370_xp_timer, .timer = &armada_370_xp_timer,
.restart = mvebu_restart, .restart = mvebu_restart,
.dt_compat = armada_370_xp_dt_board_dt_compat, .dt_compat = armada_370_xp_dt_compat,
MACHINE_END MACHINE_END