diff --git a/[refs] b/[refs]
index c58f51bfcd6c..17b729cc0e8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1112b36094e48f89ce7dca5aee90b05c30162da9
+refs/heads/master: 9f3410ff217f55c2a30bd1b2eb1032806d17c80e
diff --git a/trunk/arch/arm/mach-mvebu/addr-map.c b/trunk/arch/arm/mach-mvebu/addr-map.c
index fe454a4430be..b20fc751b1e5 100644
--- a/trunk/arch/arm/mach-mvebu/addr-map.c
+++ b/trunk/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;
 }