Merge branch 'ti-sysc-fixes' into fixes

[linux-2.6-microblaze.git] / arch / arm / mach-omap1 / ams-delta-fiq.c

diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
index dedaf71..0254eb9 100644 (file)
--- a/arch/arm/mach-omap1/ams-delta-fiq.c
+++ b/arch/arm/mach-omap1/ams-delta-fiq.c
@@ -1,3 +1,4 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  *  Amstrad E3 FIQ handling
  *
@@ -8,12 +9,9 @@
  *
  * Parts of this code are taken from linux/arch/arm/mach-omap/irq.c
  * in the MontaVista 2.4 kernel (and the Amstrad changes therein)
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
  */
 #include <linux/gpio/consumer.h>
+#include <linux/gpio/machine.h>
 #include <linux/gpio/driver.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
@@ -100,7 +98,8 @@ void __init ams_delta_init_fiq(struct gpio_chip *chip,
        }
 
        for (i = 0; i < ARRAY_SIZE(irq_data); i++) {
-               gpiod = gpiochip_request_own_desc(chip, i, pin_name[i], 0);
+               gpiod = gpiochip_request_own_desc(chip, i, pin_name[i],
+                                                 GPIO_ACTIVE_HIGH, GPIOD_IN);
                if (IS_ERR(gpiod)) {
                        pr_err("%s: failed to get GPIO pin %d (%ld)\n",
                               __func__, i, PTR_ERR(gpiod));