diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2025-09-15 20:37:23 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2025-09-22 09:29:43 +0100 |
| commit | 83c522fb642384aef43697aa5c7686363e9e92dd (patch) | |
| tree | 3bd466ac23b7d79c651444420f0a2e78c8472020 | |
| parent | f3982daccf42cefcd80218c76a6b5dd134fe97e3 (diff) | |
spi: don't check spi_controller::num_chipselect when parsing a dt device
Do not validate spi_controller::num_chipselect against SPI_CS_CNT_MAX
when parsing an spi device firmware node.
Firstly this is the wrong place, and this should be done while
registering/validating the controller. Secondly, there is no reason for
that check, as SPI_CS_CNT_MAX controls the amount of chipselects a
device may have, not a controller may have.
So drop that check as it needlessly limits controllers to SPI_CS_CNT_MAX
number of chipselects.
Likewise, drop the check for number of device chipselects larger than
controller's number of chipselects, as __spi_add_device() will already
catch that as either one of the chip selects will be out of range, or
there is a duplicate one.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Link: https://patch.msgid.link/20250915183725.219473-6-jonas.gorski@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | drivers/spi/spi.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c index 91e2f4f504e8..2eb361e9e44d 100644 --- a/drivers/spi/spi.c +++ b/drivers/spi/spi.c @@ -2427,11 +2427,6 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, return 0; } - if (ctlr->num_chipselect > SPI_CS_CNT_MAX) { - dev_err(&ctlr->dev, "No. of CS is more than max. no. of supported CS\n"); - return -EINVAL; - } - /* Device address */ rc = of_property_read_variable_u32_array(nc, "reg", &cs[0], 1, SPI_CS_CNT_MAX); @@ -2440,11 +2435,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi, nc, rc); return rc; } - if (rc > ctlr->num_chipselect) { - dev_err(&ctlr->dev, "%pOF has number of CS > ctlr->num_chipselect (%d)\n", - nc, rc); - return -EINVAL; - } + if ((of_property_present(nc, "parallel-memories")) && (!(ctlr->flags & SPI_CONTROLLER_MULTI_CS))) { dev_err(&ctlr->dev, "SPI controller doesn't support multi CS\n"); |