[PATCH] mfd: core: Fix MFD swnode and fwnode conflict

[Pratap Nirujogi <pratap.nirujogi@amd.com>]

Initializing the MFD child device's fwnode with the parent
or matching ACPI device's fwnode is causing conflict when
software_node (mfd_cell->swnode) is explicitly assigned during
device creation.

Since a device is not expected to have both fwnode and swnode,
this conflict is leading to mfd_add_hotplug_devices() failure.

To fix this issue, skip initializing the fwnode from the parent
or matching ACPI device when a swnode is already present for the
MFD child.

Signed-off-by: Pratap Nirujogi <pratap.nirujogi@amd.com>
---
 drivers/mfd/mfd-core.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/mfd/mfd-core.c b/drivers/mfd/mfd-core.c
index 76bd316a50af..d5680132ed21 100644
--- a/drivers/mfd/mfd-core.c
+++ b/drivers/mfd/mfd-core.c
@@ -212,17 +212,17 @@ static int mfd_add_device(struct device *parent, int id,
 				cell->name, platform_id);
 	}
 
-	mfd_acpi_add_device(cell, pdev);
-
-	if (cell->pdata_size) {
-		ret = platform_device_add_data(pdev,
-					cell->platform_data, cell->pdata_size);
+	if (cell->swnode) {
+		ret = device_add_software_node(&pdev->dev, cell->swnode);
 		if (ret)
 			goto fail_of_entry;
+	} else {
+		/* add parent dev fwnode only when swnode is not present */
+		mfd_acpi_add_device(cell, pdev);
 	}
 
-	if (cell->swnode) {
-		ret = device_add_software_node(&pdev->dev, cell->swnode);
+	if (cell->pdata_size) {
+		ret = platform_device_add_data(pdev, cell->platform_data, cell->pdata_size);
 		if (ret)
 			goto fail_of_entry;
 	}
-- 
2.43.0