AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2025-01-20 17:28:39 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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";
compatible = "marvell,armada_370_xp";
compatible = "marvell,armada-370-xp";
cpus {
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);
}
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