Merge remote-tracking branches 'spi/topic/bus-num', 'spi/topic/cleanup', 'spi/topic/clps711x', 'spi/topic/coldfire', 'spi/topic/completion' and 'spi/topic/davinci' into spi-next

2014-03-30 00:51:03 +00:00
parent 0f38af451f 78e39523b8 354312f16e 6f50c6bc61 8023d384ff aa0fe82629 b53b34f042
commit 9dee279b40
20 changed files with 178 additions and 292 deletions
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -1775,6 +1775,9 @@ int spi_setup(struct spi_device *spi)
 	if (!spi->bits_per_word)
 		spi->bits_per_word = 8;

+	if (!spi->max_speed_hz)
+		spi->max_speed_hz = spi->master->max_speed_hz;
+
 	if (spi->master->setup)
 		status = spi->master->setup(spi);