diff options
author | Axel Lin <axel.lin@ingics.com> | 2014-03-20 10:59:06 -0400 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-25 14:05:17 -0400 |
commit | 8023d384ff5c55a431c1a9a84cd76648d43ba7d8 (patch) | |
tree | 9dc68bbde8c8908ebdb22bc969da5a07abf10e4a | |
parent | 2271cf124a2763b7252887814a7fc8a844767e8f (diff) |
spi: coldfire-qspi: Simplify the code to set register bits for transfer speed
spi core will use spi->max_speed_hz as transfer speed if the transfer speed was
not set. So we don't need to test t->speed_hz in mcfqspi_transfer_one().
Signed-off-by: Axel Lin <axel.lin@ingics.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r-- | drivers/spi/spi-coldfire-qspi.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/spi/spi-coldfire-qspi.c b/drivers/spi/spi-coldfire-qspi.c index 6d78f96bdc55..492ceb1654e5 100644 --- a/drivers/spi/spi-coldfire-qspi.c +++ b/drivers/spi/spi-coldfire-qspi.c | |||
@@ -321,10 +321,7 @@ static int mcfqspi_transfer_one(struct spi_master *master, | |||
321 | qmr |= MCFQSPI_QMR_CPHA; | 321 | qmr |= MCFQSPI_QMR_CPHA; |
322 | if (spi->mode & SPI_CPOL) | 322 | if (spi->mode & SPI_CPOL) |
323 | qmr |= MCFQSPI_QMR_CPOL; | 323 | qmr |= MCFQSPI_QMR_CPOL; |
324 | if (t->speed_hz) | 324 | qmr |= mcfqspi_qmr_baud(t->speed_hz); |
325 | qmr |= mcfqspi_qmr_baud(t->speed_hz); | ||
326 | else | ||
327 | qmr |= mcfqspi_qmr_baud(spi->max_speed_hz); | ||
328 | mcfqspi_wr_qmr(mcfqspi, qmr); | 325 | mcfqspi_wr_qmr(mcfqspi, qmr); |
329 | 326 | ||
330 | mcfqspi_wr_qir(mcfqspi, MCFQSPI_QIR_SPIFE); | 327 | mcfqspi_wr_qir(mcfqspi, MCFQSPI_QIR_SPIFE); |