diff --git a/[refs] b/[refs]
index ae12ff06c40b..8d60c1e0875d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1f640a9c1d97a1a131879ab1efe3766443904d7
+refs/heads/master: 2bec19feabd53cba75e9dab0e79afbe868a37113
diff --git a/trunk/drivers/spi/orion_spi.c b/trunk/drivers/spi/orion_spi.c
index b872bfaf4bd2..014becb7d530 100644
--- a/trunk/drivers/spi/orion_spi.c
+++ b/trunk/drivers/spi/orion_spi.c
@@ -364,6 +364,11 @@ static int orion_spi_setup(struct spi_device *spi)
 		return -EINVAL;
 	}
 
+	/* Fix ac timing if required.   */
+	if (orion_spi->spi_info->enable_clock_fix)
+		orion_spi_setbits(orion_spi, ORION_SPI_IF_CONFIG_REG,
+				  (1 << 14));
+
 	if (spi->bits_per_word == 0)
 		spi->bits_per_word = 8;
 
diff --git a/trunk/include/linux/spi/orion_spi.h b/trunk/include/linux/spi/orion_spi.h
index b4d9fa6f797c..decf6d8c77b7 100644
--- a/trunk/include/linux/spi/orion_spi.h
+++ b/trunk/include/linux/spi/orion_spi.h
@@ -11,6 +11,7 @@
 
 struct orion_spi_info {
 	u32	tclk;		/* no <linux/clk.h> support yet */
+	u32	enable_clock_fix;
 };