diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-07 12:54:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-07 12:54:40 +0200 |
| commit | 63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa (patch) | |
| tree | 34150d2e7ac4eb6c00f4bc96991947f71a338a0d | |
| parent | spi: fsl-dspi: Add ~50ns delay between cs and sck (diff) | |
| parent | spi: fsl-dspi: Fix clock rate scale values (diff) | |
| download | linux-63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa.tar.xz linux-63031ed6b8bd69d4baff6a46f5c9b79b51bd1eaa.zip | |
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi
Conflicts:
drivers/spi/spi-fsl-dspi.c
| -rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 4b6032dd0990..5fe54cda309f 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -155,6 +155,8 @@ static void hz_to_spi_baud(char *pbr, char *br, int speed_hz, int i, j; scale_needed = clkrate / speed_hz; + if (clkrate % speed_hz) + scale_needed++; for (i = 0; i < ARRAY_SIZE(brs); i++) for (j = 0; j < ARRAY_SIZE(pbr_tbl); j++) { |