diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2019-12-03 20:34:09 +0100 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2020-08-13 16:05:04 +0200 |
| commit | ae6e60fb33cff988699dd751b2e48b604a9ffa45 (patch) | |
| tree | 951eb9f44e883e0e234d5b24d31f13eb7cde6bdb /drivers | |
| parent | d5809fd95cc54592b139738d7d29de829f82e52c (diff) | |
spi: fsl-lpspi: register spi controller earlier in probe
Ordering of stuff in lpspi probe was a little off.
- num_chipselect gets set with devm_spi_register_controller.
- devm_spi_register_controller needs data that gets set into
controller variable
Order stuff appropriate so num_chipselect gets set before it is used.
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
(cherry picked from commit a22e9000e304c75472c294abf5ba17a66d399fba)
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/spi/spi-fsl-lpspi.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/spi/spi-fsl-lpspi.c b/drivers/spi/spi-fsl-lpspi.c index 39870bc38e40..e543f6be6fbf 100644 --- a/drivers/spi/spi-fsl-lpspi.c +++ b/drivers/spi/spi-fsl-lpspi.c @@ -894,6 +894,21 @@ static int fsl_lpspi_probe(struct platform_device *pdev) goto out_controller_put; } + controller->transfer_one = fsl_lpspi_transfer_one; + controller->prepare_transfer_hardware = lpspi_prepare_xfer_hardware; + controller->unprepare_transfer_hardware = lpspi_unprepare_xfer_hardware; + controller->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH; + controller->flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX; + controller->dev.of_node = pdev->dev.of_node; + controller->bus_num = pdev->id; + controller->slave_abort = fsl_lpspi_slave_abort; + + ret = devm_spi_register_controller(&pdev->dev, controller); + if (ret < 0) { + dev_err(&pdev->dev, "spi_register_controller error.\n"); + goto out_controller_put; + } + if (!fsl_lpspi->is_slave) { controller->cs_gpios = devm_kzalloc(&controller->dev, sizeof(int) * controller->num_chipselect, GFP_KERNEL); |