plat: marvell: armada: mcbin: squash several IO windows into one

There is no need to open tree different IO window when there is
possibility of having one covering required range.

Change-Id: I9feae1fc583df1f7d97d28161cf7601f43513856
Signed-off-by: Grzegorz Jaszczyk <jaz@semihalf.com>

diff --git a/plat/marvell/armada/a8k/a80x0_mcbin/board/marvell_plat_config.c b/plat/marvell/armada/a8k/a80x0_mcbin/board/marvell_plat_config.c
index b9329675f0431459bbed6dea17a82cfe77c9ca59..75a1b0c30f92d15bc063bdcb62befe6adbc81803 100644 (file)
--- a/plat/marvell/armada/a8k/a80x0_mcbin/board/marvell_plat_config.c
+++ b/plat/marvell/armada/a8k/a80x0_mcbin/board/marvell_plat_config.c
@@ -78,12 +78,8 @@ struct addr_map_win io_win_memory_map[] = {
        /* CP1 (MCI0) internal regs */
        {0x00000000f4000000,            0x2000000,  MCI_0_TID},
 #ifndef IMAGE_BLE
-       /* PCIe0 and SPI1_CS0 (RUNIT) on CP1*/
-       {0x00000000f9000000,            0x2000000,  MCI_0_TID},
-       /* PCIe1 on CP1*/
-       {0x00000000fb000000,            0x1000000,  MCI_0_TID},
-       /* PCIe2 on CP1*/
-       {0x00000000fc000000,            0x1000000,  MCI_0_TID},
+       /* PCIe0-2 and SPI1_CS0 (RUNIT) on CP1*/
+       {0x00000000f9000000,            0x4000000,  MCI_0_TID},
        /* MCI 0 indirect window */
        {MVEBU_MCI_REG_BASE_REMAP(0),   0x100000,   MCI_0_TID},
        /* MCI 1 indirect window */