From e0160d61865c2ed11a60e3da0bccc5c01111aafe Mon Sep 17 00:00:00 2001
From: Wolfgang Muees <wolfgang.mues@auerswald.de>
Date: Fri, 22 May 2009 01:11:02 +0000
Subject: [PATCH] --- yaml --- r: 212315 b: refs/heads/master c:
 bb8beecd98de45f821a3360e0b061fc1f8da947c h: refs/heads/master i:   212313:
 c85086155d267a394679ef8e8e5f19e0cbdf0876   212311:
 09095b1f4d69daea5425ca781bf145a9e6dafa8f v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/spi/spi_bfin5xx.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index c90adbba6437..e61ea1028698 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60d0071b609ecb0aebe12aaedf34fe552da12c5b
+refs/heads/master: bb8beecd98de45f821a3360e0b061fc1f8da947c
diff --git a/trunk/drivers/spi/spi_bfin5xx.c b/trunk/drivers/spi/spi_bfin5xx.c
index 61c2ebf9fe18..b8352546c589 100644
--- a/trunk/drivers/spi/spi_bfin5xx.c
+++ b/trunk/drivers/spi/spi_bfin5xx.c
@@ -1354,6 +1354,12 @@ static int __init bfin_spi_probe(struct platform_device *pdev)
 		goto out_error_queue_alloc;
 	}
 
+	/* Reset SPI registers. If these registers were used by the boot loader,
+	 * the sky may fall on your head if you enable the dma controller.
+	 */
+	write_CTRL(drv_data, BIT_CTL_CPHA | BIT_CTL_MASTER);
+	write_FLAG(drv_data, 0xFF00);
+
 	/* Register with the SPI framework */
 	platform_set_drvdata(pdev, drv_data);
 	status = spi_register_master(master);