diff options
author | Hanna Hawa <hannah@marvell.com> | 2017-08-17 16:53:53 +0300 |
---|---|---|
committer | Kostya Porotchkin <kostap@marvell.com> | 2017-08-21 14:54:46 +0300 |
commit | baf0f468a356344a294409f22b74f0e5afca62a3 (patch) | |
tree | 0584b8c0d49a0bd3107d087413cb90763399d3f2 /include | |
parent | 39f74f1f2bf89a4cff8d8d192aca30bdac1a628f (diff) |
fix: ap806: io-win: change the name of RFU window to be IO-WIN
The name of RFU used in old AP806-Z SoC.
This patch update the used name to be IO-WIN, the correct
unit name in AP806-Ax, and AP810-A0
Change-Id: I9fc12e25c34aa97aa09a7b9b21837e71092058d9
Signed-off-by: Hanna Hawa <hannah@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/43184
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Kostya Porotchkin <kostap@marvell.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/drivers/marvell/io_win.h (renamed from include/drivers/marvell/rfu.h) | 16 | ||||
-rw-r--r-- | include/plat/marvell/a8k/common/plat_config.h | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/include/drivers/marvell/rfu.h b/include/drivers/marvell/io_win.h index 1b09bb87..b1ffd8fd 100644 --- a/include/drivers/marvell/rfu.h +++ b/include/drivers/marvell/io_win.h @@ -32,12 +32,12 @@ *************************************************************************** */ -#ifndef _RFU_H_ -#define _RFU_H_ +#ifndef _IO_WIN_H_ +#define _IO_WIN_H_ #include <stdint.h> -struct rfu_win { +struct io_win { uint32_t base_addr_high; uint32_t base_addr_low; uint32_t win_size_high; @@ -45,7 +45,7 @@ struct rfu_win { uint32_t target_id; }; -enum rfu_target_ids { +enum io_win_target_ids { MCI_0_TID = 0x0, MCI_1_TID = 0x1, MCI_2_TID = 0x2, @@ -53,12 +53,12 @@ enum rfu_target_ids { SPI_TID = 0x4, STM_TID = 0x5, BOOTROM_TID = 0x6, - RFU_MAX_TID + IO_WIN_MAX_TID }; -#define RFU_MAX_WIN_ID 7 +#define IO_WIN_MAX_NUM 7 -int init_rfu(void); +int init_io_win(void); -#endif /* _RFU_H_ */ +#endif /* _IO_WIN_H_ */ diff --git a/include/plat/marvell/a8k/common/plat_config.h b/include/plat/marvell/a8k/common/plat_config.h index f4244096..26e18f9f 100644 --- a/include/plat/marvell/a8k/common/plat_config.h +++ b/include/plat/marvell/a8k/common/plat_config.h @@ -35,7 +35,7 @@ #define __BOARD_CONFIG_H__ #include <amb_adec.h> -#include <rfu.h> +#include <io_win.h> #include <iob.h> #include <ccu.h> #include <pci_ep.h> @@ -131,7 +131,7 @@ struct power_off_method { int marvell_gpio_config(void); uintptr_t marvell_get_amb_reg_offs(int cp_index); -uintptr_t marvell_get_rfu_reg_offs(void); +uintptr_t marvell_get_io_win_reg_offs(void); uintptr_t marvell_get_iob_reg_offs(int cp_index); int marvell_get_iob_max_win(void); uintptr_t marvell_get_ccu_reg_offs(void); @@ -143,7 +143,7 @@ int marvell_get_ccu_max_win(void); * in specific Marvell standard platform */ int marvell_get_amb_memory_map(struct amb_win **win, uint32_t *size); -int marvell_get_rfu_memory_map(struct rfu_win **win, uint32_t *size); +int marvell_get_io_win_memory_map(struct io_win **win, uint32_t *size); int marvell_get_iob_memory_map(struct iob_win **win, uint32_t *size, int cp_index); int marvell_get_ccu_memory_map(struct ccu_win **win, uint32_t *size); |