From 8eb3e3bfd5544c4549a52e3cfc3df2be0b224dbd Mon Sep 17 00:00:00 2001
From: Graf Yang <graf.yang@analog.com>
Date: Tue, 18 Nov 2008 17:48:22 +0800
Subject: [PATCH] Blackfin arch: Request the gpio resource when making it as an
irq pin, avoiding override it.
Signed-off-by: Graf Yang <graf.yang@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
---
arch/blackfin/kernel/bfin_gpio.c | 4 ++--
arch/blackfin/mach-common/ints-priority.c | 15 ++++++++++++++-
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/arch/blackfin/kernel/bfin_gpio.c b/arch/blackfin/kernel/bfin_gpio.c
index f8d666e6741b..de235b8f37a8 100644
--- a/arch/blackfin/kernel/bfin_gpio.c
+++ b/arch/blackfin/kernel/bfin_gpio.c
@@ -1257,10 +1257,10 @@ static int gpio_proc_read(char *buf, char **start, off_t offset,
for (c = 0; c < MAX_RESOURCES; 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");
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
continue;
buf += len;
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index efa27cb1b721..a0bfca921712 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -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)
{
+ int ret;
+ char buf[16];
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) {
/* only probe unenabled GPIO interrupt lines */
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)
{
-
+ int ret;
+ char buf[16];
u32 gpionr = irq_to_gpio(irq);
u32 pint_val = irq2pint_lut[irq - SYS_IRQS];
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)
return -ENODEV;
+ snprintf(buf, 16, "gpio-irq%d", irq);
+ ret = bfin_gpio_request(gpionr, buf);
+ if (ret)
+ return ret;
+
if (type == IRQ_TYPE_PROBE) {
/* only probe unenabled GPIO interrupt lines */
if (__test_bit(gpionr, gpio_enabled))