lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Blackfin arch: Request the gpio resource when making it as an irq pin, avoiding override it.

Browse Source 
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Graf Yang
2008-11-18 17:48:22 +08:00
committed by Bryan Wu
parent 30af6d4904
commit 8eb3e3bfd5
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/blackfin/kernel/bfin_gpio.c
View File

@@ -1257,10 +1257,10 @@ static int gpio_proc_read(char *buf, char **start, off_t offset,
for (c = 0; c < MAX_RESOURCES; c++) { for (c = 0; c < MAX_RESOURCES; c++) {
if (!check_gpio(c) && (reserved_gpio_map[gpio_bank(c)] & gpio_bit(c))) if (!check_gpio(c) && (reserved_gpio_map[gpio_bank(c)] & gpio_bit(c)))
len = sprintf(buf, "GPIO_%d: %s \t\tGPIO %s\n", c, len = sprintf(buf, "GPIO_%d: \t%s \t\tGPIO %s\n", c,
get_label(c), get_gpio_dir(c) ? "OUTPUT" : "INPUT"); get_label(c), get_gpio_dir(c) ? "OUTPUT" : "INPUT");
else if (reserved_peri_map[gpio_bank(c)] & gpio_bit(c)) else if (reserved_peri_map[gpio_bank(c)] & gpio_bit(c))
len = sprintf(buf, "GPIO_%d: %s \t\tPeripheral\n", c, get_label(c)); len = sprintf(buf, "GPIO_%d: \t%s \t\tPeripheral\n", c, get_label(c));
else else
continue; continue;
buf += len; buf += len;

15
arch/blackfin/mach-common/ints-priority.c
View File

@@ -437,8 +437,15 @@ static void bfin_gpio_irq_shutdown(unsigned int irq)
static int bfin_gpio_irq_type(unsigned int irq, unsigned int type) static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
{ {
int ret;
char buf[16];
u32 gpionr = irq_to_gpio(irq); u32 gpionr = irq_to_gpio(irq);
snprintf(buf, 16, "gpio-irq%d", irq);
ret = bfin_gpio_request(gpionr, buf);
if (ret)
return ret;
if (type == IRQ_TYPE_PROBE) { if (type == IRQ_TYPE_PROBE) {
/* only probe unenabled GPIO interrupt lines */ /* only probe unenabled GPIO interrupt lines */
if (__test_bit(gpionr, gpio_enabled)) if (__test_bit(gpionr, gpio_enabled))
@@ -738,7 +745,8 @@ static void bfin_gpio_irq_shutdown(unsigned int irq)
static int bfin_gpio_irq_type(unsigned int irq, unsigned int type) static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
{ {
int ret;
char buf[16];
u32 gpionr = irq_to_gpio(irq); u32 gpionr = irq_to_gpio(irq);
u32 pint_val = irq2pint_lut[irq - SYS_IRQS]; u32 pint_val = irq2pint_lut[irq - SYS_IRQS];
u32 pintbit = PINT_BIT(pint_val); u32 pintbit = PINT_BIT(pint_val);
@@ -747,6 +755,11 @@ static int bfin_gpio_irq_type(unsigned int irq, unsigned int type)
if (pint_val == IRQ_NOT_AVAIL) if (pint_val == IRQ_NOT_AVAIL)
return -ENODEV; return -ENODEV;
snprintf(buf, 16, "gpio-irq%d", irq);
ret = bfin_gpio_request(gpionr, buf);
if (ret)
return ret;
if (type == IRQ_TYPE_PROBE) { if (type == IRQ_TYPE_PROBE) {
/* only probe unenabled GPIO interrupt lines */ /* only probe unenabled GPIO interrupt lines */
if (__test_bit(gpionr, gpio_enabled)) if (__test_bit(gpionr, gpio_enabled))