spi: davinci: remove 'wait_enable' platform data member

The SPI_READY bit of struct spi_device:mode serves the purpose
of letting the SPI master know if the slave can signal if it is
ready for transfer or not.

The 'wait_enable' platform data was duplicating this functionality.
Use the framework provided method of indicating this capability.

Signed-off-by: Brian Niebuhr <bniebuhr@efjohnson.com>
Tested-By: Michael Williamson <michael.williamson@criticallink.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>

diff --git a/arch/arm/mach-davinci/include/mach/spi.h b/arch/arm/mach-davinci/include/mach/spi.h
index 734d1fb99614222743b067c55f82d8668e81c4d9..fe699140269c60ecb1ee62f298361debbb42067d 100644 (file)
--- a/arch/arm/mach-davinci/include/mach/spi.h
+++ b/arch/arm/mach-davinci/include/mach/spi.h
@@ -32,7 +32,6 @@ struct davinci_spi_platform_data {
        u8      wdelay;
        u8      odd_parity;
        u8      parity_enable;
-       u8      wait_enable;
        u8      timer_disable;
        u8      clk_internal;
        u8      intr_level;

diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 17269ad54a99393acb5bb505ae99e9caf9b8a983..54808577c1215fbfc95c6ea5fad4f9fff33d94ba 100644 (file)
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -522,7 +522,7 @@ static int davinci_spi_setup(struct spi_device *spi)
                                        SPIFMT_PARITYENA_MASK,
                                        spi->chip_select);
 
-               if (davinci_spi->pdata->wait_enable)
+               if (spi->mode & SPI_READY)
                        set_fmt_bits(davinci_spi->base,
                                        SPIFMT_WAITENA_MASK,
                                        spi->chip_select);