From 29d84d8f92e587ef8fcd245b130c884d2a812b1b Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Thu, 15 Mar 2012 18:42:32 +0100
Subject: [PATCH] --- yaml --- r: 291966 b: refs/heads/master c:
 87bf5ab82884c829366914aaa813cc8b07b9fe58 h: refs/heads/master v: v3

---
 [refs]                           |  2 +-
 trunk/drivers/spi/spi-fsl-espi.c | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7cd51c9e4d9d..dd536ef13c49 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35faa55cff56441477973e454f62408714f35cd3
+refs/heads/master: 87bf5ab82884c829366914aaa813cc8b07b9fe58
diff --git a/trunk/drivers/spi/spi-fsl-espi.c b/trunk/drivers/spi/spi-fsl-espi.c
index 43350f999314..7523a2429d09 100644
--- a/trunk/drivers/spi/spi-fsl-espi.c
+++ b/trunk/drivers/spi/spi-fsl-espi.c
@@ -182,16 +182,18 @@ static int fsl_espi_setup_transfer(struct spi_device *spi,
 		cs->hw_mode |= CSMODE_DIV16;
 		pm = DIV_ROUND_UP(mpc8xxx_spi->spibrg, hz * 16 * 4);
 
-		WARN_ONCE(pm > 16, "%s: Requested speed is too low: %d Hz. "
+		WARN_ONCE(pm > 33, "%s: Requested speed is too low: %d Hz. "
 			  "Will use %d Hz instead.\n", dev_name(&spi->dev),
-			  hz, mpc8xxx_spi->spibrg / 1024);
-		if (pm > 16)
-			pm = 16;
+				hz, mpc8xxx_spi->spibrg / (4 * 16 * (32 + 1)));
+		if (pm > 33)
+			pm = 33;
 	} else {
 		pm = DIV_ROUND_UP(mpc8xxx_spi->spibrg, hz * 4);
 	}
 	if (pm)
 		pm--;
+	if (pm < 2)
+		pm = 2;
 
 	cs->hw_mode |= CSMODE_PM(pm);