Merge 75fda0e591
("spi: tegra114: Don't fail set_cs_timing when delays are zero") into android-mainline
Steps on the way to 6.6.90 Change-Id: Ibf86d6c6c536e3487d71f682ddf21812f4311f57 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
@@ -728,9 +728,9 @@ static int tegra_spi_set_hw_cs_timing(struct spi_device *spi)
|
||||
u32 inactive_cycles;
|
||||
u8 cs_state;
|
||||
|
||||
if (setup->unit != SPI_DELAY_UNIT_SCK ||
|
||||
hold->unit != SPI_DELAY_UNIT_SCK ||
|
||||
inactive->unit != SPI_DELAY_UNIT_SCK) {
|
||||
if ((setup->unit && setup->unit != SPI_DELAY_UNIT_SCK) ||
|
||||
(hold->unit && hold->unit != SPI_DELAY_UNIT_SCK) ||
|
||||
(inactive->unit && inactive->unit != SPI_DELAY_UNIT_SCK)) {
|
||||
dev_err(&spi->dev,
|
||||
"Invalid delay unit %d, should be SPI_DELAY_UNIT_SCK\n",
|
||||
SPI_DELAY_UNIT_SCK);
|
||||
|
Reference in New Issue
Block a user