Merge branch 'mvebu-misc-fixes' of git://github.com/MISL-EBU-System-SW/mainline-public into mvebu/everything

2 files changed, 5 insertions, 6 deletions

diff --git a/arch/arm/mach-mvebu/addr-map.c b/arch/arm/mach-mvebu/addr-map.c
index 595f6b722a8f..ab9b3bd4fef5 100644
--- a/arch/arm/mach-mvebu/addr-map.c
+++ b/arch/arm/mach-mvebu/addr-map.c
@@ -78,7 +78,7 @@ armada_cfg_base(const struct orion_addr_map_cfg *cfg, int win)
         if (win < 8)
                 offset = (win << 4);
         else
-                offset = ARMADA_WINDOW_8_PLUS_OFFSET + (win << 3);
+                offset = ARMADA_WINDOW_8_PLUS_OFFSET + ((win - 8) << 3);
 
         return cfg->bridge_virt_base + offset;
 }
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index a9cf335c7cb0..7434b5e36197 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -66,13 +66,12 @@ static void __init armada_370_xp_dt_init(void)
         coherency_init();
 }
 
-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)")
         .smp            = smp_ops(armada_xp_smp_ops),
         .init_machine   = armada_370_xp_dt_init,
         .map_io         = armada_370_xp_map_io,
@@ -81,5 +80,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