diff --git a/[refs] b/[refs]
index fd9e864dbca3..0cf19ef97ebf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99147b5c4167612a987860b661b9f8b79e66b81f
+refs/heads/master: c587b6fa05106606053fc5e8e344f07cd34ace23
diff --git a/trunk/drivers/spi/dw_spi.c b/trunk/drivers/spi/dw_spi.c
index f713af8309e3..d948ef4f3910 100644
--- a/trunk/drivers/spi/dw_spi.c
+++ b/trunk/drivers/spi/dw_spi.c
@@ -831,6 +831,22 @@ static void spi_hw_init(struct dw_spi *dws)
 	spi_mask_intr(dws, 0xff);
 	spi_enable_chip(dws, 1);
 	flush(dws);
+
+	/*
+	 * Try to detect the FIFO depth if not set by interface driver,
+	 * the depth could be from 2 to 256 from HW spec
+	 */
+	if (!dws->fifo_len) {
+		u32 fifo;
+		for (fifo = 2; fifo <= 257; fifo++) {
+			dw_writew(dws, txfltr, fifo);
+			if (fifo != dw_readw(dws, txfltr))
+				break;
+		}
+
+		dws->fifo_len = (fifo == 257) ? 0 : fifo;
+		dw_writew(dws, txfltr, 0);
+	}
 }
 
 int __devinit dw_spi_add_host(struct dw_spi *dws)