aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi-rockchip.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c
index 09c690c65956..a8866c9baae0 100644
--- a/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@ -295,11 +295,6 @@ static int rockchip_spi_prepare_message(struct spi_master *master,
295 struct rockchip_spi *rs = spi_master_get_devdata(master); 295 struct rockchip_spi *rs = spi_master_get_devdata(master);
296 struct spi_device *spi = msg->spi; 296 struct spi_device *spi = msg->spi;
297 297
298 if (spi->mode & SPI_CS_HIGH) {
299 dev_err(rs->dev, "spi_cs_hign: not support\n");
300 return -EINVAL;
301 }
302
303 rs->mode = spi->mode; 298 rs->mode = spi->mode;
304 299
305 return 0; 300 return 0;
@@ -657,7 +652,7 @@ static int rockchip_spi_probe(struct platform_device *pdev)
657 652
658 master->auto_runtime_pm = true; 653 master->auto_runtime_pm = true;
659 master->bus_num = pdev->id; 654 master->bus_num = pdev->id;
660 master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; 655 master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LOOP;
661 master->num_chipselect = 2; 656 master->num_chipselect = 2;
662 master->dev.of_node = pdev->dev.of_node; 657 master->dev.of_node = pdev->dev.of_node;
663 master->bits_per_word_mask = SPI_BPW_MASK(16) | SPI_BPW_MASK(8); 658 master->bits_per_word_mask = SPI_BPW_MASK(16) | SPI_BPW_MASK(8);