diff options
| author | Hanna Hawa <hannah@marvell.com> | 2017-11-02 17:56:30 +0200 |
|---|---|---|
| committer | Kostya Porotchkin <kostap@marvell.com> | 2017-11-06 18:33:39 +0200 |
| commit | d09e5ee456c828b0f6b53357129f2ef314957266 (patch) | |
| tree | f0839ae5e2c03a9e09f3a15017d279dcceaa4ee7 /include/drivers | |
| parent | 7e1870d62df84ae6406daca036f09a2e7c092869 (diff) | |
cp110: calculate base address in cp110 init function
Calculate base address in CP110 init function to avoid
passing cp_index & ap_index to different functions.
Change-Id: I457d9cbd649bdb48e9df182d114680c56ea9640e
Signed-off-by: Hanna Hawa <hannah@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/45842
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Kostya Porotchkin <kostap@marvell.com>
Diffstat (limited to 'include/drivers')
| -rw-r--r-- | include/drivers/marvell/amb_adec.h | 2 | ||||
| -rw-r--r-- | include/drivers/marvell/iob.h | 2 | ||||
| -rw-r--r-- | include/drivers/marvell/mochi/cp110_setup.h | 27 |
3 files changed, 2 insertions, 29 deletions
diff --git a/include/drivers/marvell/amb_adec.h b/include/drivers/marvell/amb_adec.h index ad782537..52090d1f 100644 --- a/include/drivers/marvell/amb_adec.h +++ b/include/drivers/marvell/amb_adec.h @@ -62,7 +62,7 @@ enum amb_attribute_ids { #define AMB_MAX_WIN_ID 7 -int init_amb_adec(int cp_index); +int init_amb_adec(uintptr_t); #endif /* _AMB_ADEC_H_ */ diff --git a/include/drivers/marvell/iob.h b/include/drivers/marvell/iob.h index 4fb328da..f487d015 100644 --- a/include/drivers/marvell/iob.h +++ b/include/drivers/marvell/iob.h @@ -55,7 +55,7 @@ enum target_ids_iob { IOB_MAX_TID }; -int init_iob(int cp_index); +int init_iob(uintptr_t); #endif /* _IOB_H_ */ diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h index 6f3d7153..20963c43 100644 --- a/include/drivers/marvell/mochi/cp110_setup.h +++ b/include/drivers/marvell/mochi/cp110_setup.h @@ -46,33 +46,6 @@ #define MVEBU_CP110_REF_ID_A1 1 #define MVEBU_CP110_REF_ID_A2 2 - -/******************************************************************************* - * RTC Configuration - ******************************************************************************/ -#define MVEBU_RTC_BASE(cp_index) (MVEBU_CP_REGS_BASE(cp_index) + 0x284000) -#define MVEBU_RTC_STATUS_REG 0x0 -#define MVEBU_RTC_STATUS_ALARM1_MASK 0x1 -#define MVEBU_RTC_STATUS_ALARM2_MASK 0x2 -#define MVEBU_RTC_TIME_REG 0xC -#define MVEBU_RTC_IRQ_1_CONFIG_REG 0x4 -#define MVEBU_RTC_IRQ_2_CONFIG_REG 0x8 -#define MVEBU_RTC_ALARM_1_REG 0x10 -#define MVEBU_RTC_ALARM_2_REG 0x14 -#define MVEBU_RTC_CCR_REG 0x18 -#define MVEBU_RTC_NOMINAL_TIMING 0x2000 -#define MVEBU_RTC_NOMINAL_TIMING_MASK 0x7FFF -#define MVEBU_RTC_TEST_CONFIG_REG 0x1C -#define MVEBU_RTC_BRIDGE_TIMING_CTRL0_REG_OFFS 0x80 -#define MVEBU_RTC_WRCLK_PERIOD_MASK 0xFFFF -#define MVEBU_RTC_WRCLK_PERIOD_DEFAULT 0x3FF -#define MVEBU_RTC_WRCLK_SETUP_OFFS 16 -#define MVEBU_RTC_WRCLK_SETUP_MASK 0xFFFF0000 -#define MVEBU_RTC_WRCLK_SETUP_DEFAULT 0x29 -#define MVEBU_RTC_BRIDGE_TIMING_CTRL1_REG_OFFS 0x84 -#define MVEBU_RTC_READ_OUTPUT_DELAY_MASK 0xFFFF -#define MVEBU_RTC_READ_OUTPUT_DELAY_DEFAULT 0x1F - static inline uint32_t cp110_device_id_get(void) { /* Returns: |