diff options
| author | Tom Rini <trini@konsulko.com> | 2015-07-01 15:38:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-07-01 15:38:12 -0400 |
| commit | 891b487098ee2169a16b1bbb354aaef28aa90630 (patch) | |
| tree | dac06e8de18355c574eaf47fe29d75873ce0fda6 /drivers/spi/cf_qspi.c | |
| parent | 6762ae68887d962e1a4be193672005bdefd3ee32 (diff) | |
| parent | 8aa5f1d971df0f668144759991e19b5195606a32 (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-spi
Diffstat (limited to 'drivers/spi/cf_qspi.c')
| -rw-r--r-- | drivers/spi/cf_qspi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/cf_qspi.c b/drivers/spi/cf_qspi.c index 834c5bd259d..e57e63eb47a 100644 --- a/drivers/spi/cf_qspi.c +++ b/drivers/spi/cf_qspi.c @@ -19,7 +19,6 @@ DECLARE_GLOBAL_DATA_PTR; -#define clamp(x, low, high) (min(max(low, x), high)) #define to_cf_qspi_slave(s) container_of(s, struct cf_qspi_slave, slave) struct cf_qspi_slave { @@ -120,7 +119,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs, dev->qmr = 2u; else /* Get the closest baud rate */ dev->qmr = clamp(((gd->bus_clk >> 2) + max_hz - 1)/max_hz, - 2u, 255u); + 2lu, 255lu); /* Map mode to QMR[CPOL] and QMR[CPHA] */ if (mode & SPI_CPOL) |