aboutsummaryrefslogtreecommitdiffstats
path: root/arch/blackfin/mach-common
diff options
context:
space:
mode:
authorBryan Wu <cooloney@kernel.org>2008-11-18 04:48:22 -0500
committerBryan Wu <cooloney@kernel.org>2008-11-18 04:48:22 -0500
commit397861cd8046549957a04d34a0b97b267cbb9589 (patch)
treefeb9a74acdf782205e2eef186a86f3141bc84ef3 /arch/blackfin/mach-common
parent10a88a2be569002ddbb669278c598d8ee11e2f50 (diff)
Blackfin arch: fix bug - gpio_bank() macros messed up bank number caculating with positioning a gpio
The whole story: Before BF51x merged, all the MAX_BLACKFIN_GPIOS are integral multiple of GPIO_BANKSIZE (= 16). But BF51x provides MAX_BLACKFIN_GPIOS = 40 which includes 3 banks and the 3rd bank has only 8 GPIO pins. Therefore, gpio_bank() macros is correct when you try to find a GPIO in which bank (GPIO_35 is in bank 2). But on BF51x gpio_bank(MAX_BLACKFIN_GPIOS) only gives out 2 banks instead of 3 banks for some static array initialization. This patch add a new macros gpio_bank_n() and GPIO_BANK_NUM to do bank number caculating and remain the gpio_bank() macros for positioning a gpio in which bank. Signed-off-by: Bryan Wu <cooloney@kernel.org>
Diffstat (limited to 'arch/blackfin/mach-common')
-rw-r--r--arch/blackfin/mach-common/ints-priority.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index c32fa695f8cc..5b374ff1c96e 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -377,8 +377,8 @@ static inline void bfin_set_irq_handler(unsigned irq, irq_flow_handler_t handle)
377 377
378#if !defined(CONFIG_BF54x) 378#if !defined(CONFIG_BF54x)
379 379
380static unsigned short gpio_enabled[gpio_bank(MAX_BLACKFIN_GPIOS)]; 380static unsigned short gpio_enabled[GPIO_BANK_NUM];
381static unsigned short gpio_edge_triggered[gpio_bank(MAX_BLACKFIN_GPIOS)]; 381static unsigned short gpio_edge_triggered[GPIO_BANK_NUM];
382 382
383extern void bfin_gpio_irq_prepare(unsigned gpio); 383extern void bfin_gpio_irq_prepare(unsigned gpio);
384 384
@@ -620,7 +620,7 @@ static unsigned char irq2pint_lut[NR_PINTS];
620static unsigned char pint2irq_lut[NR_PINT_SYS_IRQS * NR_PINT_BITS]; 620static unsigned char pint2irq_lut[NR_PINT_SYS_IRQS * NR_PINT_BITS];
621 621
622static unsigned int gpio_both_edge_triggered[NR_PINT_SYS_IRQS]; 622static unsigned int gpio_both_edge_triggered[NR_PINT_SYS_IRQS];
623static unsigned short gpio_enabled[gpio_bank(MAX_BLACKFIN_GPIOS)]; 623static unsigned short gpio_enabled[GPIO_BANK_NUM];
624 624
625 625
626struct pin_int_t { 626struct pin_int_t {