spi: Add support for software nodes

Making it possible for the drivers to assign complete
software fwnodes to the devices instead of only the device
properties in those nodes.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Link: https://lore.kernel.org/r/20210303152814.35070-2-heikki.krogerus@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index b08efe88ccd6c310efc9cf74192af8932f14beaf..9b46998ae2a44f8c9f5d3d95c1d5dbd9e92195c6 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -686,6 +686,15 @@ struct spi_device *spi_new_device(struct spi_controller *ctlr,
                }
        }
 
+       if (chip->swnode) {
+               status = device_add_software_node(&proxy->dev, chip->swnode);
+               if (status) {
+                       dev_err(&ctlr->dev, "failed to add softwade node to '%s': %d\n",
+                               chip->modalias, status);
+                       goto err_remove_props;
+               }
+       }
+
        status = spi_add_device(proxy);
        if (status < 0)
                goto err_remove_props;
@@ -693,8 +702,7 @@ struct spi_device *spi_new_device(struct spi_controller *ctlr,
        return proxy;
 
 err_remove_props:
-       if (chip->properties)
-               device_remove_properties(&proxy->dev);
+       device_remove_software_node(&proxy->dev);
 err_dev_put:
        spi_dev_put(proxy);
        return NULL;
@@ -719,6 +727,7 @@ void spi_unregister_device(struct spi_device *spi)
        }
        if (ACPI_COMPANION(&spi->dev))
                acpi_device_clear_enumerated(ACPI_COMPANION(&spi->dev));
+       device_remove_software_node(&spi->dev);
        device_unregister(&spi->dev);
 }
 EXPORT_SYMBOL_GPL(spi_unregister_device);

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 592897fa4f030ed08c07c95ea6af56abfbd4739a..f47f94ea6fa99a056183f02e0074b4520ff77bcd 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -20,6 +20,7 @@
 
 struct dma_chan;
 struct property_entry;
+struct software_node;
 struct spi_controller;
 struct spi_transfer;
 struct spi_controller_mem_ops;
@@ -1409,7 +1410,8 @@ static inline ssize_t spi_w8r16be(struct spi_device *spi, u8 cmd)
  * @modalias: Initializes spi_device.modalias; identifies the driver.
  * @platform_data: Initializes spi_device.platform_data; the particular
  *     data stored there is driver-specific.
- * @properties: Additional device properties for the device.
+ * @properties: Deprecated - use software node instead.
+ * @swnode: Software node for the device.
  * @controller_data: Initializes spi_device.controller_data; some
  *     controllers need hints about hardware setup, e.g. for DMA.
  * @irq: Initializes spi_device.irq; depends on how the board is wired.
@@ -1448,6 +1450,7 @@ struct spi_board_info {
        char            modalias[SPI_NAME_SIZE];
        const void      *platform_data;
        const struct property_entry *properties;
+       const struct software_node *swnode;
        void            *controller_data;
        int             irq;