summaryrefslogtreecommitdiffstats
path: root/drivers/spi/davinci_spi.c
diff options
context:
space:
mode:
authorBrian Niebuhr2010-10-06 14:43:31 +0200
committerSekhar Nori2010-11-18 14:08:36 +0100
commit3409e408ab0d7171ae81d198110a1f293852959f (patch)
tree88878684b29b727246ea2b994296231821a55666 /drivers/spi/davinci_spi.c
parentspi: davinci: let DMA operation be specified on per-device basis (diff)
downloadkernel-qcow2-linux-3409e408ab0d7171ae81d198110a1f293852959f.tar.gz
kernel-qcow2-linux-3409e408ab0d7171ae81d198110a1f293852959f.tar.xz
kernel-qcow2-linux-3409e408ab0d7171ae81d198110a1f293852959f.zip
spi: davinci: remove non-useful "clk_internal" platform data
The "clk_internal" platform data member which contols the CLKMOD bit in Global Control Register 1 is not useful since CLKMOD needs be set to 1 *always* to ensure master mode operation. Remove this platform data. Signed-off-by: Brian Niebuhr <bniebuhr@efjohnson.com> Tested-By: Michael Williamson <michael.williamson@criticallink.com> Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'drivers/spi/davinci_spi.c')
-rw-r--r--drivers/spi/davinci_spi.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/spi/davinci_spi.c b/drivers/spi/davinci_spi.c
index 5fe298099a1a..2e74fcd2f423 100644
--- a/drivers/spi/davinci_spi.c
+++ b/drivers/spi/davinci_spi.c
@@ -927,14 +927,6 @@ static int davinci_spi_probe(struct platform_device *pdev)
}
}
- /* Clock internal */
- if (davinci_spi->pdata->clk_internal)
- set_io_bits(davinci_spi->base + SPIGCR1,
- SPIGCR1_CLKMOD_MASK);
- else
- clear_io_bits(davinci_spi->base + SPIGCR1,
- SPIGCR1_CLKMOD_MASK);
-
if (pdata->intr_line)
iowrite32(SPI_INTLVL_1, davinci_spi->base + SPILVL);
else
@@ -943,6 +935,7 @@ static int davinci_spi_probe(struct platform_device *pdev)
iowrite32(CS_DEFAULT, davinci_spi->base + SPIDEF);
/* master mode default */
+ set_io_bits(davinci_spi->base + SPIGCR1, SPIGCR1_CLKMOD_MASK);
set_io_bits(davinci_spi->base + SPIGCR1, SPIGCR1_MASTER_MASK);
ret = spi_bitbang_start(&davinci_spi->bitbang);