Commit 472880c7 authored Aug 16, 2010 by Brian Niebuhr Committed by Sekhar Nori Nov 18, 2010

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>

parent 7fe0092b

arch/arm/mach-davinci/include/mach/spi.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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;

drivers/spi/davinci_spi.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);