Commit dbaca8e5 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown

spi: Allow to have all native CSs in use along with GPIOs

The commit 7d93aecd ("spi: Add generic support for unused native cs
with cs-gpios") excludes the valid case for the controllers that doesn't
need to switch native CS in order to perform the transfer, i.e. when

  0		native
  ...		...
  <n> - 1	native
  <n>		GPIO
  <n> + 1	GPIO
  ...		...

where <n> defines maximum of native CSs supported by the controller.

To allow this, bail out from spi_get_gpio_descs() conditionally for
the controllers which explicitly marked with SPI_MASTER_GPIO_SS.

Fixes: 7d93aecd ("spi: Add generic support for unused native cs with cs-gpios")
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20210420164425.40287-1-andriy.shevchenko@linux.intel.comSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0e793ba7
...@@ -2612,8 +2612,9 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr) ...@@ -2612,8 +2612,9 @@ static int spi_get_gpio_descs(struct spi_controller *ctlr)
} }
ctlr->unused_native_cs = ffz(native_cs_mask); ctlr->unused_native_cs = ffz(native_cs_mask);
if (num_cs_gpios && ctlr->max_native_cs &&
ctlr->unused_native_cs >= ctlr->max_native_cs) { if ((ctlr->flags & SPI_MASTER_GPIO_SS) && num_cs_gpios &&
ctlr->max_native_cs && ctlr->unused_native_cs >= ctlr->max_native_cs) {
dev_err(dev, "No unused native chip select available\n"); dev_err(dev, "No unused native chip select available\n");
return -EINVAL; return -EINVAL;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment