From: Russ Gorby Date: Mon, 7 Feb 2011 20:02:30 +0000 (-0800) Subject: serial: ifx6x60: set SPI max_speed_hz based on platform type X-Git-Tag: MMI-PSA29.97-13-9~20522^2~54 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1b79b440576b80bace7b6fa012a57ed91d763b5f;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Signed-off-by: Greg Kroah-Hartman --- 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;