diff options
| author | Addy Ke <addy.ke@rockchip.com> | 2014-07-11 04:08:51 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-11 14:59:57 +0200 |
| commit | ee780997648814d6f1e18b05234867bbd0b43ca9 (patch) | |
| tree | b0fa39b1c0f274532ccaad58bbdb0e7d9ecabf2f /drivers/spi | |
| parent | spi/rockchip: call wait_for_idle() for the transfer to complete (diff) | |
| download | linux-ee780997648814d6f1e18b05234867bbd0b43ca9.tar.xz linux-ee780997648814d6f1e18b05234867bbd0b43ca9.zip | |
spi/rockchip: master->mode_bits: remove SPI_CS_HIGH bit
Suggested-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Addy Ke <addy.ke@rockchip.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-rockchip.c | 7 |
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, struct rockchip_spi *rs = spi_master_get_devdata(master); struct spi_device *spi = msg->spi; - if (spi->mode & SPI_CS_HIGH) { - dev_err(rs->dev, "spi_cs_hign: not support\n"); - return -EINVAL; - } - rs->mode = spi->mode; return 0; @@ -657,7 +652,7 @@ static int rockchip_spi_probe(struct platform_device *pdev) master->auto_runtime_pm = true; master->bus_num = pdev->id; - master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; + master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LOOP; master->num_chipselect = 2; master->dev.of_node = pdev->dev.of_node; master->bits_per_word_mask = SPI_BPW_MASK(16) | SPI_BPW_MASK(8); |