diff options
| author | Miquel Raynal <miquel.raynal@bootlin.com> | 2019-11-08 15:07:43 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-11-08 17:44:49 +0000 |
| commit | 8f16292d8b492ca6b0d58ac0769de1c1a7bbb544 (patch) | |
| tree | 8b31146a9b943671949b6b999d3c6372a7a7754a /drivers/spi | |
| parent | dffaf7439979e6dbb820633bb4f44dcadcac847e (diff) | |
| download | linux-8f16292d8b492ca6b0d58ac0769de1c1a7bbb544.tar.gz linux-8f16292d8b492ca6b0d58ac0769de1c1a7bbb544.tar.bz2 linux-8f16292d8b492ca6b0d58ac0769de1c1a7bbb544.zip | |
spi: zynq-qspi: Do the actual hardware initialization later in the probe
Supporting more than one CS will need some tweaking of the linear
configuration register which is (rightfully) initialized in the
hardware initialization helper. The extra initialization needs the
knowledge of the actual number of CS, which is retrieved by reading
the value of the num-cs DT property.
As the initialization helper is called pretty early and might be
called much later in the probe without side effect, let's delay it a
bit so that the number of CS will be available when running this
helper. This way, adding support for multiple CS lines in a next patch
will be eased.
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/r/20191108140744.1734-7-miquel.raynal@bootlin.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-zynq-qspi.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c index 80e51c894eaa..e76f9c9738f0 100644 --- a/drivers/spi/spi-zynq-qspi.c +++ b/drivers/spi/spi-zynq-qspi.c @@ -657,9 +657,6 @@ static int zynq_qspi_probe(struct platform_device *pdev) goto clk_dis_pclk; } - /* QSPI controller initializations */ - zynq_qspi_init_hw(xqspi); - xqspi->irq = platform_get_irq(pdev, 0); if (xqspi->irq <= 0) { ret = -ENXIO; @@ -690,6 +687,10 @@ static int zynq_qspi_probe(struct platform_device *pdev) ctlr->setup = zynq_qspi_setup_op; ctlr->max_speed_hz = clk_get_rate(xqspi->refclk) / 2; ctlr->dev.of_node = np; + + /* QSPI controller initializations */ + zynq_qspi_init_hw(xqspi); + ret = devm_spi_register_controller(&pdev->dev, ctlr); if (ret) { dev_err(&pdev->dev, "spi_register_master failed\n"); |