diff options
author | Bryan Wu <cooloney@kernel.org> | 2008-11-18 04:48:22 -0500 |
---|---|---|
committer | Bryan Wu <cooloney@kernel.org> | 2008-11-18 04:48:22 -0500 |
commit | 2e8ca591479e7127c7a6406cfb54962afbd5a68e (patch) | |
tree | 4926108861806e01e4e8b4dbcca60c6298002406 | |
parent | 46fa5eecec58934902ea4a65d9c7b7a486ac6f6b (diff) |
Blackfin arch: Use GPIO_BANKSIZE macro to replace const number 16 for GPIO_BANK_NUM macro caculating
Signed-off-by: Bryan Wu <cooloney@kernel.org>
-rw-r--r-- | arch/blackfin/include/asm/gpio.h | 4 | ||||
-rw-r--r-- | arch/blackfin/include/asm/processor.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/blackfin/include/asm/gpio.h b/arch/blackfin/include/asm/gpio.h index f8fe33b8bca6..ec2ab465709e 100644 --- a/arch/blackfin/include/asm/gpio.h +++ b/arch/blackfin/include/asm/gpio.h | |||
@@ -87,9 +87,9 @@ | |||
87 | #define gpio_bank(x) ((x) >> 4) | 87 | #define gpio_bank(x) ((x) >> 4) |
88 | #define gpio_bit(x) (1<<((x) & 0xF)) | 88 | #define gpio_bit(x) (1<<((x) & 0xF)) |
89 | #define gpio_sub_n(x) ((x) & 0xF) | 89 | #define gpio_sub_n(x) ((x) & 0xF) |
90 | #define GPIO_BANK_NUM DIV_ROUND_UP(MAX_BLACKFIN_GPIOS, 16) | ||
91 | 90 | ||
92 | #define GPIO_BANKSIZE 16 | 91 | #define GPIO_BANKSIZE 16 |
92 | #define GPIO_BANK_NUM DIV_ROUND_UP(MAX_BLACKFIN_GPIOS, GPIO_BANKSIZE) | ||
93 | 93 | ||
94 | #define GPIO_0 0 | 94 | #define GPIO_0 0 |
95 | #define GPIO_1 1 | 95 | #define GPIO_1 1 |
diff --git a/arch/blackfin/include/asm/processor.h b/arch/blackfin/include/asm/processor.h index 30703c75030c..2cb0b8711fa4 100644 --- a/arch/blackfin/include/asm/processor.h +++ b/arch/blackfin/include/asm/processor.h | |||
@@ -159,6 +159,8 @@ static inline uint32_t __pure bfin_compiled_revid(void) | |||
159 | return 4; | 159 | return 4; |
160 | #elif defined(CONFIG_BF_REV_0_5) | 160 | #elif defined(CONFIG_BF_REV_0_5) |
161 | return 5; | 161 | return 5; |
162 | #elif defined(CONFIG_BF_REV_0_6) | ||
163 | return 6; | ||
162 | #elif defined(CONFIG_BF_REV_ANY) | 164 | #elif defined(CONFIG_BF_REV_ANY) |
163 | return 0xffff; | 165 | return 0xffff; |
164 | #else | 166 | #else |