summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-22 10:50:55 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2012-11-22 10:50:55 +0100
commita79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68 (patch)
treeccc6042af17706823bc1ccacf931310a9e6ec487
parent9bfd143ed247fc7a9e0573dc1fbaf6d124b5cac9 (diff)
parent8c4340fcfb3e40372101a608ccd906e456ed3fcd (diff)
downloadblackbird-op-linux-a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68.tar.gz
blackbird-op-linux-a79cfde1b1d44d6ef62bf30e49d0ec8c8300ae68.zip
Merge branch 'for-jason-1/cleanup' into mevbu-dt-additions
-rw-r--r--arch/arm/boot/dts/armada-370-xp.dtsi2
-rw-r--r--arch/arm/mach-mvebu/armada-370-xp.c9
2 files changed, 5 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 70c35f8ccf90..be175f8b3e3e 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -20,7 +20,7 @@
/ {
model = "Marvell Armada 370 and XP SoC";
- compatible = "marvell,armada_370_xp";
+ compatible = "marvell,armada-370-xp";
cpus {
cpu@0 {
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index cd6eac17fb67..bd4e13f1b1d7 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -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
OpenPOWER on IntegriCloud