diff options
| -rw-r--r-- | drivers/spi/spi_mpc83xx.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/spi/spi_mpc83xx.c b/drivers/spi/spi_mpc83xx.c index 070c6219e2d6..ab7ee445d8b2 100644 --- a/drivers/spi/spi_mpc83xx.c +++ b/drivers/spi/spi_mpc83xx.c | |||
| @@ -267,16 +267,13 @@ int mpc83xx_spi_setup_transfer(struct spi_device *spi, struct spi_transfer *t) | |||
| 267 | cs->hw_mode |= SPMODE_LEN(bits_per_word); | 267 | cs->hw_mode |= SPMODE_LEN(bits_per_word); |
| 268 | 268 | ||
| 269 | if ((mpc83xx_spi->spibrg / hz) > 64) { | 269 | if ((mpc83xx_spi->spibrg / hz) > 64) { |
| 270 | cs->hw_mode |= SPMODE_DIV16; | ||
| 270 | pm = mpc83xx_spi->spibrg / (hz * 64); | 271 | pm = mpc83xx_spi->spibrg / (hz * 64); |
| 271 | if (pm > 16) { | 272 | if (pm > 16) { |
| 272 | cs->hw_mode |= SPMODE_DIV16; | 273 | dev_err(&spi->dev, "Requested speed is too " |
| 273 | pm /= 16; | 274 | "low: %d Hz. Will use %d Hz instead.\n", |
| 274 | if (pm > 16) { | 275 | hz, mpc83xx_spi->spibrg / 1024); |
| 275 | dev_err(&spi->dev, "Requested speed is too " | 276 | pm = 16; |
| 276 | "low: %d Hz. Will use %d Hz instead.\n", | ||
| 277 | hz, mpc83xx_spi->spibrg / 1024); | ||
| 278 | pm = 16; | ||
| 279 | } | ||
| 280 | } | 277 | } |
| 281 | } else | 278 | } else |
| 282 | pm = mpc83xx_spi->spibrg / (hz * 4); | 279 | pm = mpc83xx_spi->spibrg / (hz * 4); |
