Unverified Commit 83c522fb authored by Jonas Gorski's avatar Jonas Gorski Committed by Mark Brown
Browse files

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: default avatarJonas Gorski <jonas.gorski@gmail.com>
Link: https://patch.msgid.link/20250915183725.219473-6-jonas.gorski@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f3982dac

drivers/spi/spi.c

+1 −10
Original line number Diff line number Diff line
@@ -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");