spi: Map SPI OF client IRQ at probe time

Currently the IRQs for SPI client devices, registered via device-tree,
are mapped when the client devices are registered. If the corresponding
irq-chip has not been probed yet, then the probing of the client device
will fail and will not be retried. Resolve this by mapping the IRQ at
probe time and allow the probe to be deferred if the IRQ is not yet
available.

If of_irq_get() returns an error that is not -EPROBE_DEFER, then assume
that the SPI client does not have an IRQ and set the IRQ number to zero
(which is equivalent to irq_of_parse_and_map()).

This is based on some inputs from Thierry Reding <treding@nvidia.com>.

Cc: Thierry Reding <treding@nvidia.com>
Cc: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 3abb3903f2ad454ef964299204bd3c2454890062..40c9afac047fa5cda08246b0dbd715d80d9d8513 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -270,15 +270,24 @@ EXPORT_SYMBOL_GPL(spi_bus_type);
 static int spi_drv_probe(struct device *dev)
 {
        const struct spi_driver         *sdrv = to_spi_driver(dev->driver);
+       struct spi_device               *spi = to_spi_device(dev);
        int ret;
 
        ret = of_clk_set_defaults(dev->of_node, false);
        if (ret)
                return ret;
 
+       if (dev->of_node) {
+               spi->irq = of_irq_get(dev->of_node, 0);
+               if (spi->irq == -EPROBE_DEFER)
+                       return -EPROBE_DEFER;
+               if (spi->irq < 0)
+                       spi->irq = 0;
+       }
+
        ret = dev_pm_domain_attach(dev, true);
        if (ret != -EPROBE_DEFER) {
-               ret = sdrv->probe(to_spi_device(dev));
+               ret = sdrv->probe(spi);
                if (ret)
                        dev_pm_domain_detach(dev, true);
        }
@@ -1433,9 +1442,6 @@ of_register_spi_device(struct spi_master *master, struct device_node *nc)
        }
        spi->max_speed_hz = value;
 
-       /* IRQ */
-       spi->irq = irq_of_parse_and_map(nc, 0);
-
        /* Store a pointer to the node in the device structure */
        of_node_get(nc);
        spi->dev.of_node = nc;