switch to gpio_direction_input (OMAP and mainline)

More switchover to the cross-platform GPIO interface:
use gpio_direction_input(), not an OMAP-specific call.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap1/board-palmte.c b/arch/arm/mach-omap1/board-palmte.c
index 697f0ff0844794ff1110fefb23dca0b16278d53a..3548bc200da332eb209692f7792df563c2eb2544 100644 (file)
--- a/arch/arm/mach-omap1/board-palmte.c
+++ b/arch/arm/mach-omap1/board-palmte.c
@@ -373,14 +373,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 2af64381f24a9370de0c389b7f1d6886ba669da8..36deb6f6c6977ee34b055a06a4b52dc33cc16f3a 100644 (file)
--- a/arch/arm/mach-omap1/board-palmz71.c
+++ b/arch/arm/mach-omap1/board-palmz71.c
@@ -320,7 +320,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)) {
@@ -328,7 +328,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 5c91445fbf79709b174bdceddd6a146041d72892..4ba526114b445e9347ecd13b04cf0cdf9bbd0e0b 100644 (file)
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -248,7 +248,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 04995381aa5c9965890b74704b628b6ee7d00da5..40cf504a39f4ba79283d1f41494115f0109353d0 100644 (file)
--- 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 528691d5cb51ed76899041c6285774ae2d608bd6..1a0bc47a67c8570b99fa2c8c7913b51ccf593745 100644 (file)
--- 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) {

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index f288941cd5516b423b7f88e75a710957a42b4d49..e0bf5857758aa6db72f78100181c1a2c6efeefe2 100644 (file)
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -316,7 +316,7 @@ static inline void __init sdp2430_init_smc91x(void)
                gpmc_cs_free(eth_cs);
                goto out;
        }
-       omap_set_gpio_direction(OMAP24XX_ETHR_GPIO_IRQ, 1);
+       gpio_direction_input(OMAP24XX_ETHR_GPIO_IRQ);
 
 out:
        clk_disable(gpmc_fck);

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index 57273cfd8af7170ab41e208b751e04f213436eae..84b14ca8a3a677705df4b5eaef2d5a3a295903ad 100644 (file)
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -401,7 +401,7 @@ static void __init apollon_tsc_init(void)
        /* TSC2101 */
        omap_cfg_reg(N15_24XX_GPIO85);
        omap_request_gpio(85);
-       omap_set_gpio_direction(85, 1);
+       gpio_direction_input(85);
 
        omap_cfg_reg(W14_24XX_SYS_CLKOUT);      /* mclk */
 }

diff --git a/arch/arm/mach-omap2/usb-tusb6010.c b/arch/arm/mach-omap2/usb-tusb6010.c
index 2c88207fc50d2f7ec91c1aa7bcefade74a7a2c53..d59855cbba9803649f18866d2fa27a763c6bbbfe 100644 (file)
--- a/arch/arm/mach-omap2/usb-tusb6010.c
+++ b/arch/arm/mach-omap2/usb-tusb6010.c
@@ -295,7 +295,7 @@ tusb6010_setup_interface(struct musb_hdrc_platform_data *data,
                printk(error, 3, status);
                return status;
        }
-       omap_set_gpio_direction(irq, 1);
+       gpio_direction_input(irq);
        tusb_resources[2].start = irq + IH_GPIO_BASE;
 
        /* set up memory timings ... can speed them up later */

diff --git a/arch/arm/plat-omap/debug-devices.c b/arch/arm/plat-omap/debug-devices.c
index e31154b15d9ec1bfec395891709558694272fdeb..60076a800849ba2b00fabefd0a48eca5fee909b6 100644 (file)
--- a/arch/arm/plat-omap/debug-devices.c
+++ b/arch/arm/plat-omap/debug-devices.c
@@ -77,7 +77,7 @@ int __init debug_card_init(u32 addr, unsigned gpio)
                printk(KERN_ERR "GPIO%d unavailable for smc91x IRQ\n", gpio);
                return status;
        }
-       omap_set_gpio_direction(gpio, 1);
+       gpio_direction_input(gpio);
 
        led_resources[0].start = addr;
        led_resources[0].end   = addr + SZ_4K - 1;

diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
index 4fea8f3c6ec8642afa6c758db8fa3aa83edfe6ca..aabc472dcfb89027ede621ba51101a530ac420b5 100644 (file)
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@ -635,7 +635,7 @@ static int __devinit omap2_onenand_probe(struct platform_device *pdev)
                                "OneNAND\n", c->gpio_irq);
                        goto err_iounmap;
        }
-       omap_set_gpio_direction(c->gpio_irq, 1);
+       gpio_direction_input(c->gpio_irq);
 
        if ((r = request_irq(OMAP_GPIO_IRQ(c->gpio_irq),
                             omap2_onenand_interrupt, IRQF_TRIGGER_RISING,

diff --git a/drivers/usb/host/ohci-omap.c b/drivers/usb/host/ohci-omap.c
index 91697bdb399f625eba508a0ea80da21099a1556b..22f6d1900b55fbcd384f0d41a9fbf6b184ce0af5 100644 (file)
--- a/drivers/usb/host/ohci-omap.c
+++ b/drivers/usb/host/ohci-omap.c
@@ -255,7 +255,7 @@ static int ohci_omap_init(struct usb_hcd *hcd)
                        /* gpio9 for overcurrent detction */
                        omap_cfg_reg(W8_1610_GPIO9);
                        omap_request_gpio(9);
-                       omap_set_gpio_direction(9, 1 /* IN */);
+                       gpio_direction_input(9);
 
                        /* for paranoia's sake:  disable USB.PUEN */
                        omap_cfg_reg(W4_USB_HIGHZ);