diff options
| author |  Tony Lindgren <tony@atomide.com>
| 2019-08-13 03:40:10 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com>
| 2019-08-13 03:40:10 -0700 |
| commit | 58e16d792a6a8c6b750f637a4649967fcac853dc (patch) | |
| tree | 778a940499ecfc6fb2d811dbfef735913d30618a /arch/arm/mach-omap1/ams-delta-fiq.c | |
| parent | ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack (diff) | |
| parent | bus: ti-sysc: Simplify cleanup upon failures in sysc_probe() (diff) | |
| download | linux-58e16d792a6a8c6b750f637a4649967fcac853dc.tar.gz linux-58e16d792a6a8c6b750f637a4649967fcac853dc.tar.bz2 linux-58e16d792a6a8c6b750f637a4649967fcac853dc.zip | |
Merge branch 'ti-sysc-fixes' into fixes
Diffstat (limited to 'arch/arm/mach-omap1/ams-delta-fiq.c')
| -rw-r--r-- | arch/arm/mach-omap1/ams-delta-fiq.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c index dedaf715f47c..0254eb9cf8c6 100644 --- 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)); |