diff options
| -rw-r--r-- | arch/arm/plat-omap/gpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index d17620c50c28..d2422c766cca 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
| @@ -750,6 +750,7 @@ static inline void set_24xx_gpio_triggering(struct gpio_bank *bank, int gpio, | |||
| 750 | } | 750 | } |
| 751 | #endif | 751 | #endif |
| 752 | 752 | ||
| 753 | #ifdef CONFIG_ARCH_OMAP1 | ||
| 753 | /* | 754 | /* |
| 754 | * This only applies to chips that can't do both rising and falling edge | 755 | * This only applies to chips that can't do both rising and falling edge |
| 755 | * detection at once. For all other chips, this function is a noop. | 756 | * detection at once. For all other chips, this function is a noop. |
| @@ -760,11 +761,9 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio) | |||
| 760 | u32 l = 0; | 761 | u32 l = 0; |
| 761 | 762 | ||
| 762 | switch (bank->method) { | 763 | switch (bank->method) { |
| 763 | #ifdef CONFIG_ARCH_OMAP1 | ||
| 764 | case METHOD_MPUIO: | 764 | case METHOD_MPUIO: |
| 765 | reg += OMAP_MPUIO_GPIO_INT_EDGE; | 765 | reg += OMAP_MPUIO_GPIO_INT_EDGE; |
| 766 | break; | 766 | break; |
| 767 | #endif | ||
| 768 | #ifdef CONFIG_ARCH_OMAP15XX | 767 | #ifdef CONFIG_ARCH_OMAP15XX |
| 769 | case METHOD_GPIO_1510: | 768 | case METHOD_GPIO_1510: |
| 770 | reg += OMAP1510_GPIO_INT_CONTROL; | 769 | reg += OMAP1510_GPIO_INT_CONTROL; |
| @@ -787,6 +786,7 @@ static void _toggle_gpio_edge_triggering(struct gpio_bank *bank, int gpio) | |||
| 787 | 786 | ||
| 788 | __raw_writel(l, reg); | 787 | __raw_writel(l, reg); |
| 789 | } | 788 | } |
| 789 | #endif | ||
| 790 | 790 | ||
| 791 | static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) | 791 | static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger) |
| 792 | { | 792 | { |
