]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Fix compile for onenand
authorTony Lindgren <tony@atomide.com>
Fri, 12 Dec 2008 01:50:20 +0000 (17:50 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 12 Dec 2008 01:50:20 +0000 (17:50 -0800)
Reapply more missing omap gpio conversions that got reverted
when switching to use the mainline version of the driver.

Signed-off-by: Tony Lindgren <tony@atomide.com>
drivers/mtd/onenand/omap2.c

index 762623f87f07b9538f7ce731eb0eadf735dd1645..d1e0b8e7224bfa32a87aa8d5dabb37c657b8ae34 100644 (file)
@@ -149,7 +149,7 @@ static int omap2_onenand_wait(struct mtd_info *mtd, int state)
 
                INIT_COMPLETION(c->irq_done);
                if (c->gpio_irq) {
-                       result = omap_get_gpio_datain(c->gpio_irq);
+                       result = gpio_get_value(c->gpio_irq);
                        if (result == -1) {
                                ctrl = read_reg(c, ONENAND_REG_CTRL_STATUS);
                                intr = read_reg(c, ONENAND_REG_INTERRUPT);
@@ -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(gpio_to_irq(c->gpio_irq),
                             omap2_onenand_interrupt, IRQF_TRIGGER_RISING,