diff options
author | Tony Lindgren <tony@atomide.com> | 2012-08-30 18:37:24 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2012-09-12 21:06:30 -0400 |
commit | 4b25408f1f61c35b70a19a41053b5e5e3224e97f (patch) | |
tree | 5444bab447039299d1e2ac6c6d69f9ac347c0858 /drivers/gpio/gpio-omap.c | |
parent | a940d9a1cb2ea0833421fd57e47f8ce2a6d9953b (diff) |
ARM: OMAP: Move gpio.h to include/linux/platform_data
This way we can remove includes of plat/gpio.h which won't work
with the single zImage support.
Note that we also remove the cpu_class_is_omap2() check
in gpio-omap.c as the drivers should not call it as we need to
make it local to arch/arm/mach-omap2 for single zImage support.
While at it, arrange the related includes in the standard way.
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: linux-mtd@lists.infradead.org
Cc: alsa-devel@alsa-project.org
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/gpio/gpio-omap.c')
-rw-r--r-- | drivers/gpio/gpio-omap.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/gpio/gpio-omap.c b/drivers/gpio/gpio-omap.c index e6efd77668f0..64fbce30c502 100644 --- a/drivers/gpio/gpio-omap.c +++ b/drivers/gpio/gpio-omap.c | |||
@@ -25,11 +25,9 @@ | |||
25 | #include <linux/of.h> | 25 | #include <linux/of.h> |
26 | #include <linux/of_device.h> | 26 | #include <linux/of_device.h> |
27 | #include <linux/irqdomain.h> | 27 | #include <linux/irqdomain.h> |
28 | #include <linux/gpio.h> | ||
29 | #include <linux/platform_data/gpio-omap.h> | ||
28 | 30 | ||
29 | #include <mach/hardware.h> | ||
30 | #include <asm/irq.h> | ||
31 | #include <mach/irqs.h> | ||
32 | #include <asm/gpio.h> | ||
33 | #include <asm/mach/irq.h> | 31 | #include <asm/mach/irq.h> |
34 | 32 | ||
35 | #define OFF_MODE 1 | 33 | #define OFF_MODE 1 |
@@ -385,13 +383,16 @@ static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, | |||
385 | static int gpio_irq_type(struct irq_data *d, unsigned type) | 383 | static int gpio_irq_type(struct irq_data *d, unsigned type) |
386 | { | 384 | { |
387 | struct gpio_bank *bank = irq_data_get_irq_chip_data(d); | 385 | struct gpio_bank *bank = irq_data_get_irq_chip_data(d); |
388 | unsigned gpio; | 386 | unsigned gpio = 0; |
389 | int retval; | 387 | int retval; |
390 | unsigned long flags; | 388 | unsigned long flags; |
391 | 389 | ||
392 | if (!cpu_class_is_omap2() && d->irq > IH_MPUIO_BASE) | 390 | #ifdef CONFIG_ARCH_OMAP1 |
391 | if (d->irq > IH_MPUIO_BASE) | ||
393 | gpio = OMAP_MPUIO(d->irq - IH_MPUIO_BASE); | 392 | gpio = OMAP_MPUIO(d->irq - IH_MPUIO_BASE); |
394 | else | 393 | #endif |
394 | |||
395 | if (!gpio) | ||
395 | gpio = irq_to_gpio(bank, d->irq); | 396 | gpio = irq_to_gpio(bank, d->irq); |
396 | 397 | ||
397 | if (type & ~IRQ_TYPE_SENSE_MASK) | 398 | if (type & ~IRQ_TYPE_SENSE_MASK) |