From 78da7146cd2c91130c9f7bf31183d2108695dced Mon Sep 17 00:00:00 2001 From: Michael Hennerich Date: Mon, 6 Apr 2009 19:00:32 -0700 Subject: [PATCH] --- yaml --- r: 142546 b: refs/heads/master c: 7513e006c64fbe2f43aef2139c8c1f2b1a9cb6b9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/include/asm/bfin5xx_spi.h | 2 ++ trunk/drivers/spi/spi_bfin5xx.c | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index ead2c0f9e040..2d1415ade20b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cf5858c51f88208fe56b195251ab4f21265386c +refs/heads/master: 7513e006c64fbe2f43aef2139c8c1f2b1a9cb6b9 diff --git a/trunk/arch/blackfin/include/asm/bfin5xx_spi.h b/trunk/arch/blackfin/include/asm/bfin5xx_spi.h index 0292d58f9362..ea2d24af9542 100644 --- a/trunk/arch/blackfin/include/asm/bfin5xx_spi.h +++ b/trunk/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/trunk/drivers/spi/spi_bfin5xx.c b/trunk/drivers/spi/spi_bfin5xx.c index e440718b3209..a3e06283f74d 100644 --- a/trunk/drivers/spi/spi_bfin5xx.c +++ b/trunk/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; }