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>
diff --git a/arch/blackfin/mach-common/ints-priority.c b/arch/blackfin/mach-common/ints-priority.c
index efa27cb..a0bfca9 100644
--- a/arch/blackfin/mach-common/ints-priority.c
+++ b/arch/blackfin/mach-common/ints-priority.c
@@ -437,8 +437,15 @@
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 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 @@
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))