diff options
| author |   Mark Brown <broonie@kernel.org> | 2020-12-17 17:09:51 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-17 17:09:51 +0000 |
| commit | 127a7a95df41731632c7348960908751f7f9d049 (patch) | |
| tree | cecfac58b9550a602555a02a9d583ed0f3378b38 /drivers/spi/spi-fsl-dspi.c | |
| parent | spi: dt-bindings: clarify CS behavior for spi-cs-high and gpio descriptors (diff) | |
| parent | spi: Limit the spi device max speed to controller's max speed (diff) | |
| download | linux-dev-127a7a95df41731632c7348960908751f7f9d049.tar.xz linux-dev-127a7a95df41731632c7348960908751f7f9d049.zip | |
Merge remote-tracking branch 'spi/for-5.10' into spi-5.11
Diffstat (limited to 'drivers/spi/spi-fsl-dspi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-dspi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/spi/spi-fsl-dspi.c b/drivers/spi/spi-fsl-dspi.c index 1a08c1d584ab..028736687488 100644 --- a/drivers/spi/spi-fsl-dspi.c +++ b/drivers/spi/spi-fsl-dspi.c @@ -1165,7 +1165,7 @@ static int dspi_init(struct fsl_dspi *dspi) unsigned int mcr; /* Set idle states for all chip select signals to high */ - mcr = SPI_MCR_PCSIS(GENMASK(dspi->ctlr->num_chipselect - 1, 0)); + mcr = SPI_MCR_PCSIS(GENMASK(dspi->ctlr->max_native_cs - 1, 0)); if (dspi->devtype_data->trans_mode == DSPI_XSPI_MODE) mcr |= SPI_MCR_XSPI; @@ -1250,7 +1250,7 @@ static int dspi_probe(struct platform_device *pdev) pdata = dev_get_platdata(&pdev->dev); if (pdata) { - ctlr->num_chipselect = pdata->cs_num; + ctlr->num_chipselect = ctlr->max_native_cs = pdata->cs_num; ctlr->bus_num = pdata->bus_num; /* Only Coldfire uses platform data */ @@ -1263,7 +1263,7 @@ static int dspi_probe(struct platform_device *pdev) dev_err(&pdev->dev, "can't get spi-num-chipselects\n"); goto out_ctlr_put; } - ctlr->num_chipselect = cs_num; + ctlr->num_chipselect = ctlr->max_native_cs = cs_num; of_property_read_u32(np, "bus-num", &bus_num); ctlr->bus_num = bus_num; |