diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/arm/ccn/ccn.c | 2 | ||||
| -rw-r--r-- | drivers/arm/ccn/ccn_private.h | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/arm/ccn/ccn.c b/drivers/arm/ccn/ccn.c index ec264d218..afb7d9d3b 100644 --- a/drivers/arm/ccn/ccn.c +++ b/drivers/arm/ccn/ccn.c @@ -236,7 +236,7 @@ static unsigned long long ccn_master_to_rn_id_map(unsigned long long master_map) node_id = ccn_plat_desc->master_to_rn_id_map[iface_id]; /* Set the bit corresponding to this node ID */ - rn_id_map |= (1UL << node_id); + rn_id_map |= (1ULL << node_id); } return rn_id_map; diff --git a/drivers/arm/ccn/ccn_private.h b/drivers/arm/ccn/ccn_private.h index f71597c1c..c17c27425 100644 --- a/drivers/arm/ccn/ccn_private.h +++ b/drivers/arm/ccn/ccn_private.h @@ -134,13 +134,13 @@ typedef enum rn_types { #define HNF_SAM_CTRL_SN1_ID_SHIFT 8 #define HNF_SAM_CTRL_SN2_ID_SHIFT 16 -#define HNF_SAM_CTRL_TAB0_MASK 0x3fUL +#define HNF_SAM_CTRL_TAB0_MASK ULL(0x3f) #define HNF_SAM_CTRL_TAB0_SHIFT 48 -#define HNF_SAM_CTRL_TAB1_MASK 0x3fUL +#define HNF_SAM_CTRL_TAB1_MASK ULL(0x3f) #define HNF_SAM_CTRL_TAB1_SHIFT 56 #define HNF_SAM_CTRL_3SN_ENB_SHIFT 32 -#define HNF_SAM_CTRL_3SN_ENB_MASK 0x01UL +#define HNF_SAM_CTRL_3SN_ENB_MASK ULL(0x01) /* * Macro to create a value suitable for programming into a HNF SAM Control @@ -169,7 +169,7 @@ typedef enum rn_types { #define FOR_EACH_BIT(bit_pos, bit_map) \ for (bit_pos = __builtin_ctzll(bit_map); \ bit_map; \ - bit_map &= ~(1UL << bit_pos), \ + bit_map &= ~(1ULL << (bit_pos)), \ bit_pos = __builtin_ctzll(bit_map)) /* |