firmware: meson_sm: populate platform devices from sm device tree data

[ Upstream commit e45f243409db98d610248c843b25435e7fb0baf3 ]

In some meson boards, secure monitor device has children, for example,
power secure controller. By default, secure monitor isn't the bus in terms
of device tree subsystem, so the of_platform initialization code doesn't
populate its device tree data. As a result, secure monitor's children
aren't probed at all.

Run the 'of_platform_populate()' routine manually to resolve such issues.

Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Acked-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Link: https://lore.kernel.org/r/20230324145557.27797-1-ddrokosov@sberdevices.ru
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Stable-dep-of: d8385d7433f9 ("firmware: meson-sm: unmap out_base shmem in error path")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/firmware/meson/meson_sm.c b/drivers/firmware/meson/meson_sm.c
index d081a6312627b0e767149688414589ac5b2a8cfc..bf19dd66c2137c2d5f582fe6a2f801e2b5a76fa0 100644 (file)
--- a/drivers/firmware/meson/meson_sm.c
+++ b/drivers/firmware/meson/meson_sm.c
@@ -313,11 +313,14 @@ static int __init meson_sm_probe(struct platform_device *pdev)
 
        platform_set_drvdata(pdev, fw);
 
-       pr_info("secure-monitor enabled\n");
+       if (devm_of_platform_populate(dev))
+               goto out_in_base;
 
        if (sysfs_create_group(&pdev->dev.kobj, &meson_sm_sysfs_attr_group))
                goto out_in_base;
 
+       pr_info("secure-monitor enabled\n");
+
        return 0;
 
 out_in_base: