]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
serial: ifx6x60: set SPI max_speed_hz based on platform type
authorRuss Gorby <russ.gorby@intel.com>
Mon, 7 Feb 2011 20:02:30 +0000 (12:02 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 19:16:14 +0000 (11:16 -0800)
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>
drivers/tty/serial/ifx6x60.c

index 9161cabaec37c8df007f2f7ce57e10982767418a..766f0c3aabcfa753a29bac4d14dc11c2cdaf6e56 100644 (file)
@@ -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;