diff options
Diffstat (limited to 'arch/arm/mach-omap1')
| -rw-r--r-- | arch/arm/mach-omap1/board-palmte.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-palmz71.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/board-voiceblue.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/fpga.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap1/serial.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c index df663ba7ea8..0995a0fc1dd 100644 --- a/arch/arm/mach-omap1/board-palmte.c +++ b/arch/arm/mach-omap1/board-palmte.c @@ -351,14 +351,14 @@ static void __init palmte_misc_gpio_setup(void) printk(KERN_ERR "Could not reserve PINTDAV GPIO!\n"); return; } - omap_set_gpio_direction(PALMTE_PINTDAV_GPIO, 1); + gpio_direction_input(PALMTE_PINTDAV_GPIO); /* Set USB-or-DC-IN pin as input (unused) */ if (omap_request_gpio(PALMTE_USB_OR_DC_GPIO)) { printk(KERN_ERR "Could not reserve cable signal GPIO!\n"); return; } - omap_set_gpio_direction(PALMTE_USB_OR_DC_GPIO, 1); + gpio_direction_input(PALMTE_USB_OR_DC_GPIO); } static void __init omap_palmte_init(void) diff --git a/arch/arm/mach-omap1/board-palmz71.c b/arch/arm/mach-omap1/board-palmz71.c index c33766c4dd9..5a232adaefc 100644 --- a/arch/arm/mach-omap1/board-palmz71.c +++ b/arch/arm/mach-omap1/board-palmz71.c @@ -331,7 +331,7 @@ palmz71_gpio_setup(int early) printk(KERN_ERR "Could not reserve WP GPIO!\n"); return; } - omap_set_gpio_direction(PALMZ71_MMC_WP_GPIO, 1); + gpio_direction_input(PALMZ71_MMC_WP_GPIO); /* Monitor the Power-cable-connected signal */ if (omap_request_gpio(PALMZ71_USBDETECT_GPIO)) { @@ -339,7 +339,7 @@ palmz71_gpio_setup(int early) "Could not reserve cable signal GPIO!\n"); return; } - omap_set_gpio_direction(PALMZ71_USBDETECT_GPIO, 1); + gpio_direction_input(PALMZ71_USBDETECT_GPIO); if (request_irq(OMAP_GPIO_IRQ(PALMZ71_USBDETECT_GPIO), palmz71_powercable, IRQF_SAMPLE_RANDOM, "palmz71-cable", 0)) diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c index d7ab11acc7e..86e73b7bffa 100644 --- a/arch/arm/mach-omap1/board-voiceblue.c +++ b/arch/arm/mach-omap1/board-voiceblue.c @@ -256,7 +256,7 @@ void voiceblue_wdt_disable(void) gpio_set_value(0, 0); gpio_set_value(0, 1); gpio_set_value(0, 0); - omap_set_gpio_direction(0, 1); + gpio_direction_input(0); } void voiceblue_wdt_ping(void) diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c index 04995381aa5..40cf504a39f 100644 --- a/arch/arm/mach-omap1/fpga.c +++ b/arch/arm/mach-omap1/fpga.c @@ -178,7 +178,7 @@ void omap1510_fpga_init_irq(void) * gpio.[ch] */ omap_request_gpio(13); - omap_set_gpio_direction(13, 1); + gpio_direction_input(13); set_irq_type(OMAP_GPIO_IRQ(13), IRQ_TYPE_EDGE_RISING); set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux); } diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c index 528691d5cb5..1a0bc47a67c 100644 --- a/arch/arm/mach-omap1/serial.c +++ b/arch/arm/mach-omap1/serial.c @@ -250,7 +250,7 @@ static void __init omap_serial_set_port_wakeup(int gpio_nr) gpio_nr); return; } - omap_set_gpio_direction(gpio_nr, 1); + gpio_direction_input(gpio_nr); ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt, IRQF_TRIGGER_RISING, "serial wakeup", NULL); if (ret) { |