diff options
| author | Hanna Hawa <hannah@marvell.com> | 2017-12-06 16:44:50 +0200 |
|---|---|---|
| committer | Kostya Porotchkin <kostap@marvell.com> | 2017-12-07 12:37:43 +0200 |
| commit | 940c96ed50c2ce82396e388e22f314aa01e666ee (patch) | |
| tree | a467fdbde3ab3679aad22daaf33dac4f65f74c91 /include/drivers/marvell | |
| parent | 4f36a6a3a91ed81f0f8c138197ec4baee5e6164b (diff) | |
cp110: mvebu: use cp110 base in device id functions
This patch is preperation for different CP base addresses
And added device ID of CP110 stand alone
Change-Id: Ieeecfc5eff3fc8e11301cdd7c87d425a0999725c
Signed-off-by: Hanna Hawa <hannah@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/47365
Tested-by: iSoC Platform CI <ykjenk@marvell.com>
Reviewed-by: Kostya Porotchkin <kostap@marvell.com>
Diffstat (limited to 'include/drivers/marvell')
| -rw-r--r-- | include/drivers/marvell/mochi/cp110_setup.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/drivers/marvell/mochi/cp110_setup.h b/include/drivers/marvell/mochi/cp110_setup.h index 5280e563..d2882c31 100644 --- a/include/drivers/marvell/mochi/cp110_setup.h +++ b/include/drivers/marvell/mochi/cp110_setup.h @@ -36,30 +36,32 @@ #include <mmio.h> -#define MVEBU_DEVICE_ID_REG (MVEBU_CP_DFX_BASE(0) + 0x40) +#define MVEBU_DEVICE_ID_REG (MVEBU_CP_DFX_OFFSET + 0x40) #define MVEBU_DEVICE_ID_OFFSET (0) #define MVEBU_DEVICE_ID_MASK (0xffff << MVEBU_DEVICE_ID_OFFSET) #define MVEBU_DEVICE_REV_OFFSET (16) #define MVEBU_DEVICE_REV_MASK (0xf << MVEBU_DEVICE_REV_OFFSET) #define MVEBU_70X0_DEV_ID (0x7040) #define MVEBU_80X0_DEV_ID (0x8040) +#define MVEBU_CP110_SA_DEV_ID (0x110) #define MVEBU_CP110_REF_ID_A1 1 #define MVEBU_CP110_REF_ID_A2 2 -static inline uint32_t cp110_device_id_get(void) +static inline uint32_t cp110_device_id_get(uintptr_t base) { /* Returns: * - MVEBU_70X0_DEV_ID for A70X0 family * - MVEBU_80X0_DEV_ID for A80X0 family + * - MVEBU_CP110_SA_DEV_ID for CP that connected stand alone */ - return (mmio_read_32(MVEBU_DEVICE_ID_REG) >> + return (mmio_read_32(base + MVEBU_DEVICE_ID_REG) >> MVEBU_DEVICE_ID_OFFSET) & MVEBU_DEVICE_ID_MASK; } -static inline uint32_t cp110_rev_id_get(void) +static inline uint32_t cp110_rev_id_get(uintptr_t base) { - return (mmio_read_32(MVEBU_DEVICE_ID_REG) & + return (mmio_read_32(base + MVEBU_DEVICE_ID_REG) & MVEBU_DEVICE_REV_MASK) >> MVEBU_DEVICE_REV_OFFSET; } |