Merge pull request #1745 from svenauhagen/bugfix/a8k

Armada8k GPIO Register macro fix

diff --git a/plat/marvell/a8k/common/include/a8k_plat_def.h b/plat/marvell/a8k/common/include/a8k_plat_def.h
index 7ed56e042079e733c371c51844c067dfd7ff0a26..8b7cd6486e6179f5466a099ec273462d60f0a4f1 100644 (file)
--- 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)