OMAP2: omap-keypad: Enable more than 6 rows

[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 ae15ca93e65e50519dfb9b2b972ec5cf221358dc..939bc48c2b5e8d38468fdfa9682837e851dae5f0 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;
@@ -170,7 +169,7 @@ static int __devinit tsc2301_probe(struct spi_device *spi)
        } else
                tsc->reset_gpio = -1;
 
-       spi->mode = SPI_MODE_0;
+       spi->mode = SPI_MODE_1;
        spi->bits_per_word = 16;
        /* The max speed might've been defined by the board-specific
         * struct */