Skip to content

Commit

Permalink
spi: davinci: fix SPI_NO_CS functionality
Browse files Browse the repository at this point in the history
The driver should not touch CS lines if SPI_NO_CS flag is set.
This patch fixes it as this functionality was broken accidentally
by
commit a88e34e ("spi: davinci: add support to configure gpio cs through dt").

Fixes: a88e34e ("spi: davinci: add support to configure gpio cs through dt")
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Signed-off-by: Mark Brown <broonie@linaro.org>
  • Loading branch information
Grygorii Strashko authored and Mark Brown committed Aug 21, 2014
1 parent 7d1311b commit 3f2dad9
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions drivers/spi/spi-davinci.c
Original file line number Diff line number Diff line change
Expand Up @@ -417,16 +417,16 @@ static int davinci_spi_setup(struct spi_device *spi)
flags, dev_name(&spi->dev));
internal_cs = false;
}
}

if (retval) {
dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
spi->cs_gpio, retval);
return retval;
}
if (retval) {
dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
spi->cs_gpio, retval);
return retval;
}

if (internal_cs)
set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
if (internal_cs)
set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);
}

if (spi->mode & SPI_READY)
set_io_bits(dspi->base + SPIPC0, SPIPC0_SPIENA_MASK);
Expand Down

0 comments on commit 3f2dad9

Please sign in to comment.