]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
ARM: OMAP: switch to gpio_direction_input
authorDavid Brownell <dbrownell@users.sourceforge.net>
Thu, 11 Dec 2008 01:35:26 +0000 (17:35 -0800)
committerTony Lindgren <tony@atomide.com>
Thu, 11 Dec 2008 01:35:26 +0000 (17:35 -0800)
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>
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/fpga.c
arch/arm/mach-omap1/serial.c
arch/arm/mach-omap2/board-2430sdp.c
arch/arm/mach-omap2/board-apollon.c
arch/arm/mach-omap2/usb-tusb6010.c
arch/arm/plat-omap/debug-devices.c
drivers/mtd/onenand/omap2.c
drivers/usb/host/ohci-omap.c

index df663ba7ea88b1198e0e2125ee7916b066ec4375..0995a0fc1dd0002496af4718c4ee356c82c9fd24 100644 (file)
@@ -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)
index c33766c4dd923fcf6c495021b69ea5b1b41f1235..5a232adaefcceb25e8c306f923de6dd5e891a586 100644 (file)
@@ -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))
index d7ab11acc7eb612cf9de961167f875b950ad5df6..86e73b7bffa92facf3a920f1a7919fecf2a81d29 100644 (file)
@@ -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)
index 04995381aa5c9965890b74704b628b6ee7d00da5..40cf504a39f4ba79283d1f41494115f0109353d0 100644 (file)
@@ -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);
 }
index 528691d5cb51ed76899041c6285774ae2d608bd6..1a0bc47a67c8570b99fa2c8c7913b51ccf593745 100644 (file)
@@ -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) {
index 24688efaa445f08939fc4fbafa4b2ab0f0aee51c..f844a670f072b48c4c76c24f1f02b0031fd54c8d 100644 (file)
@@ -174,7 +174,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);
index a4ba52c8119b57244f9dd086f2937fd9de40de45..abc916723702e051ca9e2eecfb83f26bc92ba04d 100644 (file)
@@ -242,7 +242,7 @@ static inline void __init apollon_init_smc91x(void)
                gpmc_cs_free(APOLLON_ETH_CS);
                goto out;
        }
-       omap_set_gpio_direction(APOLLON_ETHR_GPIO_IRQ, 1);
+       gpio_direction_input(APOLLON_ETHR_GPIO_IRQ);
 
 out:
        clk_disable(gpmc_fck);
@@ -327,15 +327,15 @@ static void __init apollon_sw_init(void)
        /* Enter SW - Y11 */
        omap_cfg_reg(Y11_242X_GPIO16);
        omap_request_gpio(SW_ENTER_GPIO16);
-       omap_set_gpio_direction(SW_ENTER_GPIO16, 1);
+       gpio_direction_input(SW_ENTER_GPIO16);
        /* Up SW - AA12 */
        omap_cfg_reg(AA12_242X_GPIO17);
        omap_request_gpio(SW_UP_GPIO17);
-       omap_set_gpio_direction(SW_UP_GPIO17, 1);
+       gpio_direction_input(SW_UP_GPIO17);
        /* Down SW - AA8 */
        omap_cfg_reg(AA8_242X_GPIO58);
        omap_request_gpio(SW_DOWN_GPIO58);
-       omap_set_gpio_direction(SW_DOWN_GPIO58, 1);
+       gpio_direction_input(SW_DOWN_GPIO58);
 
        set_irq_type(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), IRQ_TYPE_EDGE_RISING);
        if (request_irq(OMAP_GPIO_IRQ(SW_ENTER_GPIO16), &apollon_sw_interrupt,
index 10ef464d6be7f3f2768a1a7d95d6adb68e88ed17..eb2399dc74c2e7ec9aec00984ead084cbafb89b7 100644 (file)
@@ -297,7 +297,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 */
index e31154b15d9ec1bfec395891709558694272fdeb..60076a800849ba2b00fabefd0a48eca5fee909b6 100644 (file)
@@ -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;
index cf1501d26a39a94d0af04ed9fdbcbdf45ca27a07..197d8e554cc7c65dcd2fd16a453487bbc2fc87d5 100644 (file)
@@ -634,7 +634,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,
index 91697bdb399f625eba508a0ea80da21099a1556b..22f6d1900b55fbcd384f0d41a9fbf6b184ce0af5 100644 (file)
@@ -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);