diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 27080f145a3bc3a9258f4791dae53dfa19d37131..2bffa022370105905e4d7a1d86547b50c0b28368 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -445,9 +445,6 @@ static int davinci_spi_setup(struct spi_device *spi)
 
 		if (internal_cs) {
 			set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
-		} else if (spi->mode & SPI_CS_WORD) {
-			dev_err(&spi->dev, "SPI_CS_WORD can't be use with GPIO CS\n");
-			return -EINVAL;
 		}
 	}