aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/serial/ifx6x60.c
diff options
context:
space:
mode:
authorRuss Gorby <russ.gorby@intel.com>2011-02-07 15:02:30 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 14:16:14 -0500
commit1b79b440576b80bace7b6fa012a57ed91d763b5f (patch)
tree934703b1c70acec71ac6682eb34dbe831eb1c086 /drivers/tty/serial/ifx6x60.c
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/ifx6x60.c')
-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 9161cabaec3..766f0c3aabc 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)
722 /* note len is BYTES, not transfers */ 722 /* note len is BYTES, not transfers */
723 ifx_dev->spi_xfer.len = IFX_SPI_TRANSFER_SIZE; 723 ifx_dev->spi_xfer.len = IFX_SPI_TRANSFER_SIZE;
724 ifx_dev->spi_xfer.cs_change = 0; 724 ifx_dev->spi_xfer.cs_change = 0;
725 ifx_dev->spi_xfer.speed_hz = 12500000; 725 ifx_dev->spi_xfer.speed_hz = ifx_dev->spi_dev->max_speed_hz;
726 /* ifx_dev->spi_xfer.speed_hz = 390625; */ 726 /* ifx_dev->spi_xfer.speed_hz = 390625; */
727 ifx_dev->spi_xfer.bits_per_word = spi_bpw; 727 ifx_dev->spi_xfer.bits_per_word = spi_bpw;
728 728
@@ -992,6 +992,7 @@ static int ifx_spi_spi_probe(struct spi_device *spi)
992 ifx_dev->modem = pl_data->modem_type; 992 ifx_dev->modem = pl_data->modem_type;
993 ifx_dev->use_dma = pl_data->use_dma; 993 ifx_dev->use_dma = pl_data->use_dma;
994 ifx_dev->max_hz = pl_data->max_hz; 994 ifx_dev->max_hz = pl_data->max_hz;
995 spi->max_speed_hz = ifx_dev->max_hz;
995 996
996 /* ensure SPI protocol flags are initialized to enable transfer */ 997 /* ensure SPI protocol flags are initialized to enable transfer */
997 ifx_dev->spi_more = 0; 998 ifx_dev->spi_more = 0;