summaryrefslogtreecommitdiff
path: root/drivers/tty/serial
diff options
context:
space:
mode:
authorRuss Gorby <russ.gorby@intel.com>2011-02-07 12:02:30 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 11:16:14 -0800
commit1b79b440576b80bace7b6fa012a57ed91d763b5f (patch)
tree934703b1c70acec71ac6682eb34dbe831eb1c086 /drivers/tty/serial
parentf089140ea760b42542389c96f9a54d3076696b2c (diff)
serial: ifx6x60: set SPI max_speed_hz based on platform type
Platforms containing the 6260 can run up to 25Mhz. For these platforms set max_speed_hz to 25Mhz. Signed-off-by: Russ Gorby <russ.gorby@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/serial')
-rw-r--r--drivers/tty/serial/ifx6x60.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c
index 9161cabaec37..766f0c3aabcf 100644
--- a/drivers/tty/serial/ifx6x60.c
+++ b/drivers/tty/serial/ifx6x60.c
@@ -722,7 +722,7 @@ static void ifx_spi_io(unsigned long data)
/* note len is BYTES, not transfers */
ifx_dev->spi_xfer.len = IFX_SPI_TRANSFER_SIZE;
ifx_dev->spi_xfer.cs_change = 0;
- ifx_dev->spi_xfer.speed_hz = 12500000;
+ ifx_dev->spi_xfer.speed_hz = ifx_dev->spi_dev->max_speed_hz;
/* ifx_dev->spi_xfer.speed_hz = 390625; */
ifx_dev->spi_xfer.bits_per_word = spi_bpw;
@@ -992,6 +992,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
ifx_dev->modem = pl_data->modem_type;
ifx_dev->use_dma = pl_data->use_dma;
ifx_dev->max_hz = pl_data->max_hz;
+ spi->max_speed_hz = ifx_dev->max_hz;
/* ensure SPI protocol flags are initialized to enable transfer */
ifx_dev->spi_more = 0;