spi: allow attaching device properties to SPI board info

Generic device properties support statically defined property sets. For
them to be usable, we need to attach these property sets before devices
are registered and probed. Allowing to attach property list to
spi_board_info structure will allow non-ACPI non-DT boards switch to using
generic properties and get rid of custom platform data.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 90b5b2efafbf45c2435af2771c4842a37786eee7..6cc86060d22f005400bb5dcfb4bb4b91d4952596 100644 (file)
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@ -31,6 +31,7 @@
 #include <linux/of_gpio.h>
 #include <linux/pm_runtime.h>
 #include <linux/pm_domain.h>
+#include <linux/property.h>
 #include <linux/export.h>
 #include <linux/sched/rt.h>
 #include <uapi/linux/sched/types.h>
@@ -600,13 +601,28 @@ struct spi_device *spi_new_device(struct spi_master *master,
        proxy->controller_data = chip->controller_data;
        proxy->controller_state = NULL;
 
-       status = spi_add_device(proxy);
-       if (status < 0) {
-               spi_dev_put(proxy);
-               return NULL;
+       if (chip->properties) {
+               status = device_add_properties(&proxy->dev, chip->properties);
+               if (status) {
+                       dev_err(&master->dev,
+                               "failed to add properties to '%s': %d\n",
+                               chip->modalias, status);
+                       goto err_dev_put;
+               }
        }
 
+       status = spi_add_device(proxy);
+       if (status < 0)
+               goto err_remove_props;
+
        return proxy;
+
+err_remove_props:
+       if (chip->properties)
+               device_remove_properties(&proxy->dev);
+err_dev_put:
+       spi_dev_put(proxy);
+       return NULL;
 }
 EXPORT_SYMBOL_GPL(spi_new_device);
 
@@ -664,6 +680,7 @@ static void spi_match_master_to_boardinfo(struct spi_master *master,
  *
  * The board info passed can safely be __initdata ... but be careful of
  * any embedded pointers (platform_data, etc), they're copied as-is.
+ * Device properties are deep-copied though.
  *
  * Return: zero on success, else a negative error code.
  */
@@ -683,6 +700,13 @@ int spi_register_board_info(struct spi_board_info const *info, unsigned n)
                struct spi_master *master;
 
                memcpy(&bi->board_info, info, sizeof(*info));
+               if (info->properties) {
+                       bi->board_info.properties =
+                                       property_entries_dup(info->properties);
+                       if (IS_ERR(bi->board_info.properties))
+                               return PTR_ERR(bi->board_info.properties);
+               }
+
                mutex_lock(&board_lock);
                list_add_tail(&bi->list, &board_list);
                list_for_each_entry(master, &spi_master_list, list)

diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
index 75c6bd0ac605b2024509985214cdc3d451c6ab53..5a8c4b24f2dc8020c5856be1bc07d99bed5a9ccc 100644 (file)
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
@@ -23,6 +23,7 @@
 #include <linux/scatterlist.h>
 
 struct dma_chan;
+struct property_entry;
 struct spi_master;
 struct spi_transfer;
 struct spi_flash_read_message;
@@ -1209,6 +1210,7 @@ int spi_flash_read(struct spi_device *spi,
  * @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.
  * @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.
@@ -1241,10 +1243,12 @@ struct spi_board_info {
         *
         * platform_data goes to spi_device.dev.platform_data,
         * controller_data goes to spi_device.controller_data,
+        * device properties are copied and attached to spi_device,
         * irq is copied too
         */
        char            modalias[SPI_NAME_SIZE];
        const void      *platform_data;
+       const struct property_entry *properties;
        void            *controller_data;
        int             irq;