diff options
| author | Michael Hennerich <michael.hennerich@analog.com> | 2009-04-07 04:00:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-07 17:31:04 +0200 |
| commit | 7513e006c64fbe2f43aef2139c8c1f2b1a9cb6b9 (patch) | |
| tree | 44817ca1febd0599ea8bff50825fc58568f4e7c3 | |
| parent | Blackfin SPI Driver: ensure cache coherency before doing DMA (diff) | |
| download | linux-7513e006c64fbe2f43aef2139c8c1f2b1a9cb6b9.tar.xz linux-7513e006c64fbe2f43aef2139c8c1f2b1a9cb6b9.zip | |
Blackfin SPI Driver: Fix erroneous SPI Clock divisor calculation
Fix erroneous SPI Clock divisor calculation. Make sure SPI_BAUD is always
>= 2. Writing a value of 0 or 1 to the SPI_BAUD register disables the
serial clock.
Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Cc: David Brownell <david-b@pacbell.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/blackfin/include/asm/bfin5xx_spi.h | 2 | ||||
| -rw-r--r-- | drivers/spi/spi_bfin5xx.c | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/blackfin/include/asm/bfin5xx_spi.h b/arch/blackfin/include/asm/bfin5xx_spi.h index 0292d58f9362..ea2d24af9542 100644 --- a/arch/blackfin/include/asm/bfin5xx_spi.h +++ b/arch/blackfin/include/asm/bfin5xx_spi.h @@ -11,6 +11,8 @@ #ifndef _SPI_CHANNEL_H_ #define _SPI_CHANNEL_H_ +#define MIN_SPI_BAUD_VAL 2 + #define SPI_READ 0 #define SPI_WRITE 1 diff --git a/drivers/spi/spi_bfin5xx.c b/drivers/spi/spi_bfin5xx.c index e440718b3209..a3e06283f74d 100644 --- a/drivers/spi/spi_bfin5xx.c +++ b/drivers/spi/spi_bfin5xx.c @@ -158,6 +158,9 @@ static u16 hz_to_spi_baud(u32 speed_hz) if ((sclk % (2 * speed_hz)) > 0) spi_baud++; + if (spi_baud < MIN_SPI_BAUD_VAL) + spi_baud = MIN_SPI_BAUD_VAL; + return spi_baud; } |