use gpio_direction_output (OMAP tree only)

[linux-2.6-omap-h63xx.git] / drivers / spi / tsc2301-core.c

diff --git a/drivers/spi/tsc2301-core.c b/drivers/spi/tsc2301-core.c
index 500c3dcba6ad12cc46e3cf40987b57cae72c9e3a..715e400ebf7898cd0ea0df13fc0ea71bb7935340 100644 (file)
--- a/drivers/spi/tsc2301-core.c
+++ b/drivers/spi/tsc2301-core.c
@@ -26,7 +26,7 @@
 #include <linux/spi/tsc2301.h>
 
 #ifdef CONFIG_ARCH_OMAP
-#include <asm/arch/gpio.h>
+#include <mach/gpio.h>
 #endif
 
 u16 tsc2301_read_reg(struct tsc2301 *tsc, int reg)
@@ -151,7 +151,6 @@ static int __devinit tsc2301_probe(struct spi_device *spi)
 
        dev_set_drvdata(&spi->dev, tsc);
        tsc->spi = spi;
-       spi->dev.power.power_state = PMSG_ON;
 
        tsc->enable_clock = pdata->enable_clock;
        tsc->disable_clock = pdata->disable_clock;
@@ -162,10 +161,9 @@ static int __devinit tsc2301_probe(struct spi_device *spi)
                r = omap_request_gpio(tsc->reset_gpio);
                if (r < 0)
                        goto err1;
-               omap_set_gpio_dataout(tsc->reset_gpio, 1);
-               omap_set_gpio_direction(tsc->reset_gpio, 0);
+               gpio_direction_output(tsc->reset_gpio, 1);
                mdelay(1);
-               omap_set_gpio_dataout(tsc->reset_gpio, 0);
+               gpio_set_value(tsc->reset_gpio, 0);
 #endif
        } else
                tsc->reset_gpio = -1;