---

yaml
---
r: 212338
b: refs/heads/master
c: 4190f6a
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e72dcde72c712708e2145ab0ecff539ff4a4c7fb
+refs/heads/master: 4190f6a51f3f9c7c8298202d31b3ead9381c33f1

trunk/drivers/spi/spi_bfin5xx.c

@@ -1040,9 +1040,14 @@ static int bfin_spi_setup(struct spi_device *spi)
 	 */
 	chip->baud = hz_to_spi_baud(spi->max_speed_hz);
 	chip->chip_select_num = spi->chip_select;
-	if (chip->chip_select_num < MAX_CTRL_CS)
+	if (chip->chip_select_num < MAX_CTRL_CS) {
+		if (!(spi->mode & SPI_CPHA))
+			dev_warn(&spi->dev, "Warning: SPI CPHA not set:"
+				" Slave Select not under software control!\n"
+				" See Documentation/blackfin/bfin-spi-notes.txt");
+
 		chip->flag = (1 << spi->chip_select) << 8;
-	else
+	} else
 		chip->cs_gpio = chip->chip_select_num - MAX_CTRL_CS;
 
 	if (chip->enable_dma && chip->pio_interrupt) {