[PATCH v2 2/3] driver core: platform: allow attaching software nodes when creating devices

[Dmitry Torokhov <dmitry.torokhov@gmail.com>]

Extend platform_device_info structure with an optional pointer to a
software node to be used as a secondary firmware node for the device
being created. If software node has not been registered yet it will be
automatically registered.

This reduces boilerplate needed when switching legacy board code to
static device properties/GPIO references.

Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
---
 drivers/base/platform.c         | 9 ++++++++-
 include/linux/platform_device.h | 7 ++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index b45d41b018ca..ec467ccd05b3 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -850,6 +850,9 @@ struct platform_device *platform_device_register_full(
 	int ret;
 	struct platform_device *pdev;
 
+	if (pdevinfo->swnode && pdevinfo->properties)
+		return ERR_PTR(-EINVAL);
+
 	pdev = platform_device_alloc(pdevinfo->name, pdevinfo->id);
 	if (!pdev)
 		return ERR_PTR(-ENOMEM);
@@ -875,7 +878,11 @@ struct platform_device *platform_device_register_full(
 	if (ret)
 		goto err;
 
-	if (pdevinfo->properties) {
+	if (pdevinfo->swnode) {
+		ret = device_add_software_node(&pdev->dev, pdevinfo->swnode);
+		if (ret)
+			goto err;
+	} else if (pdevinfo->properties) {
 		ret = device_create_managed_software_node(&pdev->dev,
 							  pdevinfo->properties, NULL);
 		if (ret)
diff --git a/include/linux/platform_device.h b/include/linux/platform_device.h
index 5f54217930e1..754e4bf2771a 100644
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
@@ -136,10 +136,14 @@ extern int platform_add_devices(struct platform_device **, int);
  * @data: device-specific data for this platform device.
  * @size_data: size of device-specific data.
  * @dma_mask: DMA mask for the device.
+ * @swnode: a secondary software node to be attached to the device. The node
+ *	will be automatically registered and its lifetime tied to the platform
+ *	device if it is not registered yet.
  * @properties: a set of software properties for the device. If provided,
  *	a managed software node will be automatically created and
  *	assigned to the device. The properties array must be terminated
- *	with a sentinel entry.
+ *	with a sentinel entry. Specifying both @properties and @swnode is not
+ *	allowed.
  *
  * This structure is used to hold information needed to create and register
  * a platform device using platform_device_register_full().
@@ -164,6 +168,7 @@ struct platform_device_info {
 	size_t size_data;
 	u64 dma_mask;
 
+	const struct software_node *swnode;
 	const struct property_entry *properties;
 };
 extern struct platform_device *platform_device_register_full(
-- 
2.53.0.310.g728cabbaf7-goog