diff options
Diffstat (limited to 'arch/arm/plat-omap/gpio.c')
-rw-r--r-- | arch/arm/plat-omap/gpio.c | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c index e07ab233e783..c0322b56efe9 100644 --- a/arch/arm/plat-omap/gpio.c +++ b/arch/arm/plat-omap/gpio.c | |||
@@ -407,20 +407,7 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable) | |||
407 | __raw_writel(l, reg); | 407 | __raw_writel(l, reg); |
408 | } | 408 | } |
409 | 409 | ||
410 | void omap_set_gpio_dataout(int gpio, int enable) | 410 | static int __omap_get_gpio_datain(int gpio) |
411 | { | ||
412 | struct gpio_bank *bank; | ||
413 | unsigned long flags; | ||
414 | |||
415 | if (check_gpio(gpio) < 0) | ||
416 | return; | ||
417 | bank = get_gpio_bank(gpio); | ||
418 | spin_lock_irqsave(&bank->lock, flags); | ||
419 | _set_gpio_dataout(bank, get_gpio_index(gpio), enable); | ||
420 | spin_unlock_irqrestore(&bank->lock, flags); | ||
421 | } | ||
422 | |||
423 | int omap_get_gpio_datain(int gpio) | ||
424 | { | 411 | { |
425 | struct gpio_bank *bank; | 412 | struct gpio_bank *bank; |
426 | void __iomem *reg; | 413 | void __iomem *reg; |
@@ -1258,7 +1245,7 @@ static int gpio_input(struct gpio_chip *chip, unsigned offset) | |||
1258 | 1245 | ||
1259 | static int gpio_get(struct gpio_chip *chip, unsigned offset) | 1246 | static int gpio_get(struct gpio_chip *chip, unsigned offset) |
1260 | { | 1247 | { |
1261 | return omap_get_gpio_datain(chip->base + offset); | 1248 | return __omap_get_gpio_datain(chip->base + offset); |
1262 | } | 1249 | } |
1263 | 1250 | ||
1264 | static int gpio_output(struct gpio_chip *chip, unsigned offset, int value) | 1251 | static int gpio_output(struct gpio_chip *chip, unsigned offset, int value) |
@@ -1755,8 +1742,6 @@ static int __init omap_gpio_sysinit(void) | |||
1755 | EXPORT_SYMBOL(omap_request_gpio); | 1742 | EXPORT_SYMBOL(omap_request_gpio); |
1756 | EXPORT_SYMBOL(omap_free_gpio); | 1743 | EXPORT_SYMBOL(omap_free_gpio); |
1757 | EXPORT_SYMBOL(omap_set_gpio_direction); | 1744 | EXPORT_SYMBOL(omap_set_gpio_direction); |
1758 | EXPORT_SYMBOL(omap_set_gpio_dataout); | ||
1759 | EXPORT_SYMBOL(omap_get_gpio_datain); | ||
1760 | 1745 | ||
1761 | arch_initcall(omap_gpio_sysinit); | 1746 | arch_initcall(omap_gpio_sysinit); |
1762 | 1747 | ||
@@ -1814,7 +1799,7 @@ static int dbg_gpio_show(struct seq_file *s, void *unused) | |||
1814 | continue; | 1799 | continue; |
1815 | 1800 | ||
1816 | irq = bank->virtual_irq_start + j; | 1801 | irq = bank->virtual_irq_start + j; |
1817 | value = omap_get_gpio_datain(gpio); | 1802 | value = gpio_get_value(gpio); |
1818 | is_in = gpio_is_input(bank, mask); | 1803 | is_in = gpio_is_input(bank, mask); |
1819 | 1804 | ||
1820 | if (bank_is_mpuio(bank)) | 1805 | if (bank_is_mpuio(bank)) |