firmware: stratix10-svc: Add of_platform_default_populate()
authorMahesh Rao <mahesh.rao@intel.com>
Wed, 26 Mar 2025 11:54:46 +0000 (06:54 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 15 Apr 2025 16:23:02 +0000 (18:23 +0200)
Add of_platform_default_populate() to stratix10-svc
driver as the firmware/svc node was moved out of soc.
This fixes the failed probing of child drivers of
svc node.

Cc: stable@vger.kernel.org
Fixes: 23c3ebed382a ("arm64: dts: socfpga: agilex: move firmware out of soc node")
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: Xu Yilun <yilun.xu@intel.com>
Signed-off-by: Mahesh Rao <mahesh.rao@intel.com>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Link: https://lore.kernel.org/r/20250326115446.36123-1-dinguyen@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/firmware/stratix10-svc.c

index 3c52cb7..e3f990d 100644 (file)
@@ -1224,22 +1224,28 @@ static int stratix10_svc_drv_probe(struct platform_device *pdev)
        if (!svc->intel_svc_fcs) {
                dev_err(dev, "failed to allocate %s device\n", INTEL_FCS);
                ret = -ENOMEM;
-               goto err_unregister_dev;
+               goto err_unregister_rsu_dev;
        }
 
        ret = platform_device_add(svc->intel_svc_fcs);
        if (ret) {
                platform_device_put(svc->intel_svc_fcs);
-               goto err_unregister_dev;
+               goto err_unregister_rsu_dev;
        }
 
+       ret = of_platform_default_populate(dev_of_node(dev), NULL, dev);
+       if (ret)
+               goto err_unregister_fcs_dev;
+
        dev_set_drvdata(dev, svc);
 
        pr_info("Intel Service Layer Driver Initialized\n");
 
        return 0;
 
-err_unregister_dev:
+err_unregister_fcs_dev:
+       platform_device_unregister(svc->intel_svc_fcs);
+err_unregister_rsu_dev:
        platform_device_unregister(svc->stratix10_svc_rsu);
 err_free_kfifo:
        kfifo_free(&controller->svc_fifo);
@@ -1253,6 +1259,8 @@ static void stratix10_svc_drv_remove(struct platform_device *pdev)
        struct stratix10_svc *svc = dev_get_drvdata(&pdev->dev);
        struct stratix10_svc_controller *ctrl = platform_get_drvdata(pdev);
 
+       of_platform_depopulate(ctrl->dev);
+
        platform_device_unregister(svc->intel_svc_fcs);
        platform_device_unregister(svc->stratix10_svc_rsu);