mvebu: io-win: add parameter for ccu function to set AP number

Part of AP810 preparation and driver changes, change IO_WIN driver
to get the number of AP it should initialize, to get the AP
base address and window map.
No functional changes introduced by this patch.

Change-Id: I20522ebcdd9bcea4691a4d65cb839bcb5d46f4e6
Signed-off-by: Hanna Hawa <hannah@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/43397
Reviewed-by: Kostya Porotchkin <kostap@marvell.com>
Tested-by: iSoC Platform CI <ykjenk@marvell.com>

8 files changed, 16 insertions, 17 deletions

diff --git a/plat/marvell/a8k/a3900/board/marvell_plat_config.c b/plat/marvell/a8k/a3900/board/marvell_plat_config.c
index 69af4bc5..a701b709 100644
--- a/plat/marvell/a8k/a3900/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a3900/board/marvell_plat_config.c
@@ -74,13 +74,12 @@ struct io_win io_win_memory_map[] = {
 	{0x0,	MVEBU_MCI_REG_BASE_REMAP(1),	0x0,	0x100000,	MCI_1_TID},
 };
 
-
-uintptr_t marvell_get_io_win_reg_offs(void)
+uintptr_t marvell_get_io_win_reg_offs(int ap_index)
 {
 	return MVEBU_IO_WIN_BASE;
 }
 
-int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size)
+int marvell_get_io_win_memory_map(int ap_index, struct io_win **win, uint32_t *size)
 {
 	*win = io_win_memory_map;
 	if (*win == NULL)
diff --git a/plat/marvell/a8k/a70x0/board/marvell_plat_config.c b/plat/marvell/a8k/a70x0/board/marvell_plat_config.c
index 1f0a00e6..cb95e42c 100644
--- a/plat/marvell/a8k/a70x0/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a70x0/board/marvell_plat_config.c
@@ -73,12 +73,12 @@ struct io_win io_win_memory_map[] = {
 };
 
 
-uintptr_t marvell_get_io_win_reg_offs(void)
+uintptr_t marvell_get_io_win_reg_offs(int ap_index)
 {
 	return MVEBU_IO_WIN_BASE;
 }
 
-int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size)
+int marvell_get_io_win_memory_map(int ap_index, struct io_win **win, uint32_t *size)
 {
 	*win = io_win_memory_map;
 	if (*win == NULL)
diff --git a/plat/marvell/a8k/a70x0_amc/board/marvell_plat_config.c b/plat/marvell/a8k/a70x0_amc/board/marvell_plat_config.c
index bc3f5b16..ad0f67eb 100644
--- a/plat/marvell/a8k/a70x0_amc/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a70x0_amc/board/marvell_plat_config.c
@@ -73,12 +73,12 @@ struct io_win io_win_memory_map[] = {
 };
 
 
-uintptr_t marvell_get_io_win_reg_offs(void)
+uintptr_t marvell_get_io_win_reg_offs(int ap_index)
 {
 	return MVEBU_IO_WIN_BASE;
 }
 
-int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size)
+int marvell_get_io_win_memory_map(int ap_index, struct io_win **win, uint32_t *size)
 {
 	*win = io_win_memory_map;
 	if (*win == NULL)
diff --git a/plat/marvell/a8k/a70x0_cust/board/marvell_plat_config.c b/plat/marvell/a8k/a70x0_cust/board/marvell_plat_config.c
index a9d746ba..cf4d018f 100644
--- a/plat/marvell/a8k/a70x0_cust/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a70x0_cust/board/marvell_plat_config.c
@@ -74,12 +74,12 @@ struct io_win io_win_memory_map[] = {
 	{0x0,	MVEBU_MCI_REG_BASE_REMAP(1),	0x0,	0x100000, MCI_1_TID},
 };
 
-uintptr_t marvell_get_io_win_reg_offs(void)
+uintptr_t marvell_get_io_win_reg_offs(int ap_index)
 {
 	return MVEBU_IO_WIN_BASE;
 }
 
-int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size)
+int marvell_get_io_win_memory_map(int ap_index, struct io_win **win, uint32_t *size)
 {
 	*win = io_win_memory_map;
 	if (*win == NULL)
diff --git a/plat/marvell/a8k/a70x0_pcac/board/marvell_plat_config.c b/plat/marvell/a8k/a70x0_pcac/board/marvell_plat_config.c
index 2d059522..d1769f0b 100644
--- a/plat/marvell/a8k/a70x0_pcac/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a70x0_pcac/board/marvell_plat_config.c
@@ -73,12 +73,12 @@ struct io_win io_win_memory_map[] = {
 };
 
 
-uintptr_t marvell_get_io_win_reg_offs(void)
+uintptr_t marvell_get_io_win_reg_offs(int ap_index)
 {
 	return MVEBU_IO_WIN_BASE;
 }
 
-int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size)
+int marvell_get_io_win_memory_map(int ap_index, struct io_win **win, uint32_t *size)
 {
 	*win = io_win_memory_map;
 	if (*win == NULL)
diff --git a/plat/marvell/a8k/a80x0/board/marvell_plat_config.c b/plat/marvell/a8k/a80x0/board/marvell_plat_config.c
index 836ac3d5..dcbd7bab 100644
--- a/plat/marvell/a8k/a80x0/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a80x0/board/marvell_plat_config.c
@@ -80,12 +80,12 @@ struct io_win io_win_memory_map[] = {
 	{0x0,	MVEBU_MCI_REG_BASE_REMAP(1),	0x0,	0x100000,  MCI_1_TID},
 };
 
-uintptr_t marvell_get_io_win_reg_offs(void)
+uintptr_t marvell_get_io_win_reg_offs(int ap_index)
 {
 	return MVEBU_IO_WIN_BASE;
 }
 
-int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size)
+int marvell_get_io_win_memory_map(int ap_index, struct io_win **win, uint32_t *size)
 {
 	*win = io_win_memory_map;
 	if (*win == NULL)
diff --git a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c b/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c
index 581f6197..3c501a80 100644
--- a/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a80x0_mcbin/board/marvell_plat_config.c
@@ -113,12 +113,12 @@ struct io_win io_win_memory_map[] = {
 	{0x0,	MVEBU_MCI_REG_BASE_REMAP(1),	0x0,	0x100000,   MCI_1_TID},
 };
 
-uintptr_t marvell_get_io_win_reg_offs(void)
+uintptr_t marvell_get_io_win_reg_offs(int ap_index)
 {
 	return MVEBU_IO_WIN_BASE;
 }
 
-int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size)
+int marvell_get_io_win_memory_map(int ap_index, struct io_win **win, uint32_t *size)
 {
 	*win = io_win_memory_map;
 	if (*win == NULL)
diff --git a/plat/marvell/a8k/a80x0_ocp/board/marvell_plat_config.c b/plat/marvell/a8k/a80x0_ocp/board/marvell_plat_config.c
index 8aacf0ba..6e3db9e2 100644
--- a/plat/marvell/a8k/a80x0_ocp/board/marvell_plat_config.c
+++ b/plat/marvell/a8k/a80x0_ocp/board/marvell_plat_config.c
@@ -74,12 +74,12 @@ struct io_win io_win_memory_map[] = {
 	{0x0,	MVEBU_MCI_REG_BASE_REMAP(1),	0x0,	0x100000,   MCI_1_TID},
 };
 
-uintptr_t marvell_get_io_win_reg_offs(void)
+uintptr_t marvell_get_io_win_reg_offs(int ap_index)
 {
 	return MVEBU_IO_WIN_BASE;
 }
 
-int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size)
+int marvell_get_io_win_memory_map(int ap_index, struct io_win **win, uint32_t *size)
 {
 	*win = io_win_memory_map;
 	if (*win == NULL)