diff options
| author | Antonio Niño Díaz <antonio.ninodiaz@arm.com> | 2019-01-31 10:22:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 10:22:50 +0000 |
| commit | c723ad84761a377ece6ebb57aa08b4686d2ae3d7 (patch) | |
| tree | b819cf39d4a964fa0ce49806da05f381b699e2e0 /plat/marvell | |
| parent | 5ce301b5cf2850a767d37a6478b04699494169b9 (diff) | |
| parent | dfea29b273d07419968d23327dcd151c4d9e518c (diff) | |
Merge pull request #1745 from svenauhagen/bugfix/a8k
Armada8k GPIO Register macro fix
Diffstat (limited to 'plat/marvell')
| -rw-r--r-- | plat/marvell/a8k/common/include/a8k_plat_def.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plat/marvell/a8k/common/include/a8k_plat_def.h b/plat/marvell/a8k/common/include/a8k_plat_def.h index 7ed56e04..8b7cd648 100644 --- a/plat/marvell/a8k/common/include/a8k_plat_def.h +++ b/plat/marvell/a8k/common/include/a8k_plat_def.h @@ -53,12 +53,12 @@ 0x440000 + ((n / 8) << 2)) #define MVEBU_CP_GPIO_DATA_OUT(cp_index, n) \ (MVEBU_CP_REGS_BASE(cp_index) + \ - 0x440100 + ((n > 32) ? 0x40 : 0x00)) + 0x440100 + ((n > 31) ? 0x40 : 0x00)) #define MVEBU_CP_GPIO_DATA_OUT_EN(cp_index, n) \ (MVEBU_CP_REGS_BASE(cp_index) + \ - 0x440104 + ((n > 32) ? 0x40 : 0x00)) + 0x440104 + ((n > 31) ? 0x40 : 0x00)) #define MVEBU_CP_GPIO_DATA_IN(cp_index, n) (MVEBU_CP_REGS_BASE(cp_index) + \ - 0x440110 + ((n > 32) ? 0x40 : 0x00)) + 0x440110 + ((n > 31) ? 0x40 : 0x00)) #define MVEBU_AP_MPP_REGS(n) (MVEBU_RFU_BASE + 0x4000 + ((n) << 2)) #define MVEBU_AP_GPIO_REGS (MVEBU_RFU_BASE + 0x5040) #define MVEBU_AP_GPIO_DATA_IN (MVEBU_AP_GPIO_REGS + 0x10) |